diff --git a/webapp/channels/src/components/advanced_text_editor/send_button/send_button.scss b/webapp/channels/src/components/advanced_text_editor/send_button/send_button.scss
index 957fd9569d..f045a9f084 100644
--- a/webapp/channels/src/components/advanced_text_editor/send_button/send_button.scss
+++ b/webapp/channels/src/components/advanced_text_editor/send_button/send_button.scss
@@ -37,6 +37,8 @@
     }
 
     .SendMessageButton {
+        flex: 1;
+        border-radius: 4px 0 0 4px;
         cursor: pointer;
         padding-inline: 7px;
         place-content: center;
@@ -47,9 +49,15 @@
         .ios & {
             display: flex;
         }
+
+        &.singleAction {
+            border-radius: 4px;
+        }
     }
 
     .button_send_post_options {
+        width: 21px;
+        border-radius: 0 4px 4px 0;
         border-left: 1px solid color-mix(in srgb, currentColor 20%, transparent);
         padding-inline: 2px;
     }
diff --git a/webapp/channels/src/components/advanced_text_editor/send_button/send_button.tsx b/webapp/channels/src/components/advanced_text_editor/send_button/send_button.tsx
index c5f3491e33..d926b31fd5 100644
--- a/webapp/channels/src/components/advanced_text_editor/send_button/send_button.tsx
+++ b/webapp/channels/src/components/advanced_text_editor/send_button/send_button.tsx
@@ -72,7 +72,7 @@ const SendButton = ({disabled, handleSubmit, channelId}: SendButtonProps) => {
                 disabled={disabled}
             >
                 <button
-                    className={classNames('SendMessageButton', {disabled})}
+                    className={classNames('SendMessageButton', {disabled}, {singleAction: !isScheduledPostEnabled})}
                     data-testid='SendMessageButton'
                     tabIndex={0}
                     aria-label={formatMessage({
diff --git a/webapp/channels/src/utils/utils.tsx b/webapp/channels/src/utils/utils.tsx
index eda0a3db0e..0d3487c13d 100644
--- a/webapp/channels/src/utils/utils.tsx
+++ b/webapp/channels/src/utils/utils.tsx
@@ -407,6 +407,9 @@ export function applyTheme(theme: Theme) {
         changeCss('.app__body .emoji-picker .nav-tabs > li.active > a', 'border-bottom-color:' + theme.buttonBg + '!important;');
         changeCss('.app__body .btn-primary:hover', 'background:' + blendColors(theme.buttonBg, '#000000', 0.1));
         changeCss('.app__body .btn-primary:active', 'background:' + blendColors(theme.buttonBg, '#000000', 0.2));
+
+        changeCss('.app__body .SendMessageButton:not(.disabled):hover', 'background:' + blendColors(theme.buttonBg, '#000000', 0.1));
+        changeCss('.app__body #button_send_post_options:not(.disabled):hover', 'background:' + blendColors(theme.buttonBg, '#000000', 0.1));
     }
 
     if (theme.buttonColor) {