2 files changed, 26 insertions, 21 deletions
diff --git a/app/javascript/flavours/glitch/components/status.js b/app/javascript/flavours/glitch/components/status.js
index e8105e705..b8fb5383a 100644
--- a/app/javascript/flavours/glitch/components/status.js
+++ b/app/javascript/flavours/glitch/components/status.js
@@ -394,22 +394,24 @@ export default class Status extends ImmutablePureComponent {
           tabIndex='0'
         >
           <header className='status__info'>
-            {prepend && account ? (
-              <StatusPrepend
-                type={prepend}
-                account={account}
-                parseClick={parseClick}
-                notificationId={this.props.notificationId}
-              />
-            ) : null}
-            {!muted ? (
-              <StatusHeader
-                status={status}
-                friend={account}
-                collapsed={isExpanded === false}
-                parseClick={parseClick}
-              />
-            ) : null}
+            <span>
+              {prepend && account ? (
+                <StatusPrepend
+                  type={prepend}
+                  account={account}
+                  parseClick={parseClick}
+                  notificationId={this.props.notificationId}
+                />
+              ) : null}
+              {!muted ? (
+                <StatusHeader
+                  status={status}
+                  friend={account}
+                  collapsed={isExpanded === false}
+                  parseClick={parseClick}
+                />
+              ) : null}
+            </span>
             <StatusIcons
               status={status}
               mediaIcon={mediaIcon}
diff --git a/app/javascript/flavours/glitch/styles/components/status.scss b/app/javascript/flavours/glitch/styles/components/status.scss
index dfe60e2be..15727155b 100644
--- a/app/javascript/flavours/glitch/styles/components/status.scss
+++ b/app/javascript/flavours/glitch/styles/components/status.scss
@@ -289,21 +289,24 @@
 .status__info__account .status__display-name {
   display: block;
   max-width: 100%;
-  padding-right: 25px;
 }
 
 .status__info {
-  position: relative;
+  display: flex;
   padding: 2px 0 5px;
   font-size: 15px;
   line-height: 24px;
+
+  > span {
+    overflow: hidden;
+  }
 }
 
 .status__info__icons {
-  position: absolute;
+  margin-left: auto;
+  display: flex;
+  align-items: baseline;
   color: lighten($ui-base-color, 26%);
-  top: 0;
-  right: 0;
 
   .status__visibility-icon {
     padding-left: 6px;