diff --git a/mastodon/app/javascript/styles/tangerineui-cherry/tangerineui-cherry.scss b/mastodon/app/javascript/styles/tangerineui-cherry/tangerineui-cherry.scss
index fa1f37f..12ba9ac 100644
--- a/mastodon/app/javascript/styles/tangerineui-cherry/tangerineui-cherry.scss
+++ b/mastodon/app/javascript/styles/tangerineui-cherry/tangerineui-cherry.scss
@@ -2987,13 +2987,22 @@ div[tabindex="-1"] + div[tabindex="-1"] > .status__wrapper > .status-reply.statu
     .app-body:not(.layout-multiple-columns) .column-back-button::after {
         display: none;
     }
-    .app-body:not(.layout-multiple-columns) .column-header__button:is(.active, .active:hover, :hover),
+    .app-body .column-header__buttons {
+        height: 55px;
+    }
     .app-body:not(.layout-multiple-columns) .column-header,
     .app-body:not(.layout-multiple-columns) .column-back-button {
         background-color: transparent;
         -webkit-backdrop-filter: none;
         backdrop-filter: none;
     }
+    .app-body:not(.layout-multiple-columns) .column-header__button,
+    .app-body:not(.layout-multiple-columns) .column-header__button:is(.active, .active:hover, :hover) {
+        padding: 0 12px;
+        height: 35px !important;
+        align-self: center;
+        transform-origin: center right;
+    }
 }
 
 .app-body .column-back-button--slim-button::after {
@@ -3100,18 +3109,20 @@ div[tabindex="-1"] + div[tabindex="-1"] > .status__wrapper > .status-reply.statu
         height: 45px;
         border-bottom: 0;
     }
-    .app-body:not(.layout-multiple-columns):has(.ui .ui__header__links > .button[href="/auth/sign_in"]) .tabs-bar__wrapper {
-        display: none;
-    }
-    .app-body:not(.layout-multiple-columns):has(.ui__header .ui__header__links .button[href="/publish"]) .tabs-bar__wrapper:has(> #tabs-bar__portal > .column-header__wrapper, > #tabs-bar__portal > .column-back-button) { /* Column header (2nd top bar) is displayed only if there's something inside */
+    .app-body:not(.layout-multiple-columns) .tabs-bar__wrapper {
         display: block;
         top: 0;
-        left: 40px;
+        left: 45px;
         right: 105px;
         height: 55px;
         position: fixed;
+    }
+    .app-body:not(.layout-multiple-columns):not(:has(.ui .ui__header__links > .button[href="/auth/sign_in"])) .tabs-bar__wrapper {
         z-index: 3;
     }
+    .app-body:not(.layout-multiple-columns):has(.ui .ui__header__links > .button[href="/auth/sign_in"]) .tabs-bar__wrapper :is(.column-back-button, .column-header > *) {
+        display: none;
+    }
     .app-body:not(.layout-multiple-columns)
         :is(
             .column-header,
@@ -3626,6 +3637,7 @@ div[tabindex="-1"] + div[tabindex="-1"] > .status__wrapper > .status-reply.statu
     }
     .app-body .column-link__icon {
         margin: 0;
+        transform: scale(1.3);
     }
     .app-body .column-link span {
         padding-left: .5em;
diff --git a/mastodon/app/javascript/styles/tangerineui-purple/tangerineui-purple.scss b/mastodon/app/javascript/styles/tangerineui-purple/tangerineui-purple.scss
index f7acc12..cf8f654 100644
--- a/mastodon/app/javascript/styles/tangerineui-purple/tangerineui-purple.scss
+++ b/mastodon/app/javascript/styles/tangerineui-purple/tangerineui-purple.scss
@@ -2987,13 +2987,22 @@ div[tabindex="-1"] + div[tabindex="-1"] > .status__wrapper > .status-reply.statu
     .app-body:not(.layout-multiple-columns) .column-back-button::after {
         display: none;
     }
-    .app-body:not(.layout-multiple-columns) .column-header__button:is(.active, .active:hover, :hover),
+    .app-body .column-header__buttons {
+        height: 55px;
+    }
     .app-body:not(.layout-multiple-columns) .column-header,
     .app-body:not(.layout-multiple-columns) .column-back-button {
         background-color: transparent;
         -webkit-backdrop-filter: none;
         backdrop-filter: none;
     }
+    .app-body:not(.layout-multiple-columns) .column-header__button,
+    .app-body:not(.layout-multiple-columns) .column-header__button:is(.active, .active:hover, :hover) {
+        padding: 0 12px;
+        height: 35px !important;
+        align-self: center;
+        transform-origin: center right;
+    }
 }
 
 .app-body .column-back-button--slim-button::after {
@@ -3100,18 +3109,20 @@ div[tabindex="-1"] + div[tabindex="-1"] > .status__wrapper > .status-reply.statu
         height: 45px;
         border-bottom: 0;
     }
-    .app-body:not(.layout-multiple-columns):has(.ui .ui__header__links > .button[href="/auth/sign_in"]) .tabs-bar__wrapper {
-        display: none;
-    }
-    .app-body:not(.layout-multiple-columns):has(.ui__header .ui__header__links .button[href="/publish"]) .tabs-bar__wrapper:has(> #tabs-bar__portal > .column-header__wrapper, > #tabs-bar__portal > .column-back-button) { /* Column header (2nd top bar) is displayed only if there's something inside */
+    .app-body:not(.layout-multiple-columns) .tabs-bar__wrapper {
         display: block;
         top: 0;
-        left: 40px;
+        left: 45px;
         right: 105px;
         height: 55px;
         position: fixed;
+    }
+    .app-body:not(.layout-multiple-columns):not(:has(.ui .ui__header__links > .button[href="/auth/sign_in"])) .tabs-bar__wrapper {
         z-index: 3;
     }
+    .app-body:not(.layout-multiple-columns):has(.ui .ui__header__links > .button[href="/auth/sign_in"]) .tabs-bar__wrapper :is(.column-back-button, .column-header > *) {
+        display: none;
+    }
     .app-body:not(.layout-multiple-columns)
         :is(
             .column-header,
@@ -3626,6 +3637,7 @@ div[tabindex="-1"] + div[tabindex="-1"] > .status__wrapper > .status-reply.statu
     }
     .app-body .column-link__icon {
         margin: 0;
+        transform: scale(1.3);
     }
     .app-body .column-link span {
         padding-left: .5em;
diff --git a/mastodon/app/javascript/styles/tangerineui/tangerineui.scss b/mastodon/app/javascript/styles/tangerineui/tangerineui.scss
index f3a2537..e4f9f8f 100644
--- a/mastodon/app/javascript/styles/tangerineui/tangerineui.scss
+++ b/mastodon/app/javascript/styles/tangerineui/tangerineui.scss
@@ -2987,13 +2987,22 @@ div[tabindex="-1"] + div[tabindex="-1"] > .status__wrapper > .status-reply.statu
     .app-body:not(.layout-multiple-columns) .column-back-button::after {
         display: none;
     }
-    .app-body:not(.layout-multiple-columns) .column-header__button:is(.active, .active:hover, :hover),
+    .app-body .column-header__buttons {
+        height: 55px;
+    }
     .app-body:not(.layout-multiple-columns) .column-header,
     .app-body:not(.layout-multiple-columns) .column-back-button {
         background-color: transparent;
         -webkit-backdrop-filter: none;
         backdrop-filter: none;
     }
+    .app-body:not(.layout-multiple-columns) .column-header__button,
+    .app-body:not(.layout-multiple-columns) .column-header__button:is(.active, .active:hover, :hover) {
+        padding: 0 12px;
+        height: 35px !important;
+        align-self: center;
+        transform-origin: center right;
+    }
 }
 
 .app-body .column-back-button--slim-button::after {
@@ -3100,18 +3109,20 @@ div[tabindex="-1"] + div[tabindex="-1"] > .status__wrapper > .status-reply.statu
         height: 45px;
         border-bottom: 0;
     }
-    .app-body:not(.layout-multiple-columns):has(.ui .ui__header__links > .button[href="/auth/sign_in"]) .tabs-bar__wrapper {
-        display: none;
-    }
-    .app-body:not(.layout-multiple-columns):has(.ui__header .ui__header__links .button[href="/publish"]) .tabs-bar__wrapper:has(> #tabs-bar__portal > .column-header__wrapper, > #tabs-bar__portal > .column-back-button) { /* Column header (2nd top bar) is displayed only if there's something inside */
+    .app-body:not(.layout-multiple-columns) .tabs-bar__wrapper {
         display: block;
         top: 0;
-        left: 40px;
+        left: 45px;
         right: 105px;
         height: 55px;
         position: fixed;
+    }
+    .app-body:not(.layout-multiple-columns):not(:has(.ui .ui__header__links > .button[href="/auth/sign_in"])) .tabs-bar__wrapper {
         z-index: 3;
     }
+    .app-body:not(.layout-multiple-columns):has(.ui .ui__header__links > .button[href="/auth/sign_in"]) .tabs-bar__wrapper :is(.column-back-button, .column-header > *) {
+        display: none;
+    }
     .app-body:not(.layout-multiple-columns)
         :is(
             .column-header,
@@ -3626,6 +3637,7 @@ div[tabindex="-1"] + div[tabindex="-1"] > .status__wrapper > .status-reply.statu
     }
     .app-body .column-link__icon {
         margin: 0;
+        transform: scale(1.3);
     }
     .app-body .column-link span {
         padding-left: .5em;