diff --git a/webapp/channels/src/components/custom_status/custom_status.scss b/webapp/channels/src/components/custom_status/custom_status.scss
index 7d691f8ac1..637ad0b5d9 100644
--- a/webapp/channels/src/components/custom_status/custom_status.scss
+++ b/webapp/channels/src/components/custom_status/custom_status.scss
@@ -267,8 +267,7 @@
     }
 
     .custom-status {
-        display: flex;
-        justify-content: center;
+        display: inline-block;
 
         &-expiry {
             font-weight: 400;
diff --git a/webapp/channels/src/components/custom_status/custom_status_emoji.tsx b/webapp/channels/src/components/custom_status/custom_status_emoji.tsx
index 082e1e39ff..32aaeeab28 100644
--- a/webapp/channels/src/components/custom_status/custom_status_emoji.tsx
+++ b/webapp/channels/src/components/custom_status/custom_status_emoji.tsx
@@ -76,7 +76,7 @@ function CustomStatusEmoji({
                             emojiName={customStatus.emoji}
                             size={14}
                             emojiStyle={{
-                                marginTop: 2,
+                                marginTop: -1,
                             }}
                         />
                         {customStatus.text &&
diff --git a/webapp/channels/src/components/custom_status/custom_status_modal.tsx b/webapp/channels/src/components/custom_status/custom_status_modal.tsx
index 69fcbd5cb2..8106c51484 100644
--- a/webapp/channels/src/components/custom_status/custom_status_modal.tsx
+++ b/webapp/channels/src/components/custom_status/custom_status_modal.tsx
@@ -206,7 +206,7 @@ const CustomStatusModal: React.FC<Props> = (props: Props) => {
         case FOUR_HOURS:
             return moment().add(4, 'hours').seconds(0).milliseconds(0).toISOString();
         case TODAY:
-            return moment().endOf('day').toISOString();
+            return moment().add(1, 'day').set({hour: 8, minute: 0}).toISOString();
         case THIS_WEEK:
             return moment().endOf('week').toISOString();
         case DATE_AND_TIME: