diff --git a/src/components/middle/message/WebPage.scss b/src/components/middle/message/WebPage.scss
index 323b11a5..1fb4fea0 100644
--- a/src/components/middle/message/WebPage.scss
+++ b/src/components/middle/message/WebPage.scss
@@ -75,7 +75,8 @@
         content: '';
         display: inline-block;
         width: var(--meta-safe-area-size);
-        height: 0.5rem;
+        height: 0.75rem;
+        float: right;
       }
     }
   }
diff --git a/src/components/middle/message/_message-content.scss b/src/components/middle/message/_message-content.scss
index 6fa8fb68..141906fa 100644
--- a/src/components/middle/message/_message-content.scss
+++ b/src/components/middle/message/_message-content.scss
@@ -72,6 +72,10 @@
       position: relative;
       top: auto;
       bottom: -.5rem !important;
+      margin-top: -.25rem;
+      &:not([dir=rtl]) {
+        margin-top: -1.25rem;
+      }
     }
   }
 
@@ -248,7 +252,7 @@
     }
 
     .File + .text-content {
-      margin-top: .313rem;
+      margin-top: .3125rem;
     }
   }
 
@@ -587,6 +591,11 @@
 }
 
 .forwarded-message {
+  .message-content.poll & {
+    // MessageOutgoingStatus's icon needs more space
+    margin-bottom: 0.5rem;
+  }
+
   .message-content:not(.custom-shape) & {
     position: relative;
     margin-top: 0.25rem;