Merge branch 'master' into glitch-soc/merge-upstream

2 files changed, 7 insertions, 3 deletions

diff --git a/app/javascript/mastodon/features/account/components/header.js b/app/javascript/mastodon/features/account/components/header.js
index fd7ad5e07..0a3345f0e 100644
--- a/app/javascript/mastodon/features/account/components/header.js
+++ b/app/javascript/mastodon/features/account/components/header.js
@@ -219,9 +219,9 @@ class Header extends ImmutablePureComponent {
             <div className='spacer' />
 
             <div className='account__header__tabs__buttons'>
-              <DropdownMenuContainer items={menu} icon='ellipsis-v' size={24} direction='right' />
-
               {actionBtn}
+
+              <DropdownMenuContainer items={menu} icon='ellipsis-v' size={24} direction='right' />
             </div>
           </div>
 
diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index 53c392062..5580d9783 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -5300,7 +5300,7 @@ noscript {
     .avatar {
       display: block;
       flex: 0 0 auto;
-      width: 90px;
+      width: 94px;
       margin-left: -2px;
 
       .account__avatar {
@@ -5319,12 +5319,16 @@ noscript {
       display: flex;
       align-items: center;
       padding-top: 55px;
+      overflow: hidden;
 
       .icon-button {
         border: 1px solid lighten($ui-base-color, 12%);
         border-radius: 4px;
         box-sizing: content-box;
         padding: 2px;
+      }
+
+      .button {
         margin: 0 8px;
       }
     }