diff --git a/app/soapbox/components/sub_navigation.js b/app/soapbox/components/sub_navigation.js
index abaceedfaf..063448b5cd 100644
Binary files a/app/soapbox/components/sub_navigation.js and b/app/soapbox/components/sub_navigation.js differ
diff --git a/app/soapbox/features/account_timeline/components/column_settings.js b/app/soapbox/features/account_timeline/components/column_settings.js
index 7836c01f00..130cb47db0 100644
Binary files a/app/soapbox/features/account_timeline/components/column_settings.js and b/app/soapbox/features/account_timeline/components/column_settings.js differ
diff --git a/app/soapbox/features/account_timeline/index.js b/app/soapbox/features/account_timeline/index.js
index 003ab8dda4..4d4d916eaf 100644
Binary files a/app/soapbox/features/account_timeline/index.js and b/app/soapbox/features/account_timeline/index.js differ
diff --git a/app/soapbox/features/ui/components/tabs_bar.js b/app/soapbox/features/ui/components/tabs_bar.js
index 8a7dbaf18b..d82356fd05 100644
Binary files a/app/soapbox/features/ui/components/tabs_bar.js and b/app/soapbox/features/ui/components/tabs_bar.js differ
diff --git a/app/styles/components/account-header.scss b/app/styles/components/account-header.scss
index 401e3fcc51..69902227c6 100644
--- a/app/styles/components/account-header.scss
+++ b/app/styles/components/account-header.scss
@@ -335,3 +335,9 @@
     }
   }
 }
+
+@media (min-width: 896px) {
+  .account-timeline .sub-navigation {
+    top: 134px;
+  }
+}
diff --git a/app/styles/components/columns.scss b/app/styles/components/columns.scss
index 61c3ab4898..36b172599f 100644
--- a/app/styles/components/columns.scss
+++ b/app/styles/components/columns.scss
@@ -625,6 +625,12 @@
     overflow-y: auto;
   }
 
+  &__description {
+    font-size: 14px;
+    margin: 5px 0 15px;
+    color: var(--primary-text-color--faint);
+  }
+
   &__close {
     display: flex;
     align-items: center;
@@ -949,3 +955,7 @@
 .column .explanation-box {
   background: var(--foreground-color);
 }
+
+.sub-navigation + .account__section-headline {
+  background: var(--foreground-color);
+}
diff --git a/app/styles/components/icon.scss b/app/styles/components/icon.scss
index 40b55cdda5..3514ab03a9 100644
--- a/app/styles/components/icon.scss
+++ b/app/styles/components/icon.scss
@@ -25,14 +25,14 @@
     svg.icon-tabler-bell,
     svg.icon-tabler-messages {
       path:nth-child(2) {
-        fill: var(--primary-text-color);
+        fill: currentColor;
       }
     }
 
     svg.icon-tabler-users {
       circle,
       circle + path {
-        fill: var(--primary-text-color);
+        fill: currentColor;
       }
     }
 
@@ -40,8 +40,8 @@
       stroke: var(--background-color);
 
       rect {
-        fill: var(--primary-text-color);
-        stroke: var(--primary-text-color);
+        fill: currentColor;
+        stroke: currentColor;
       }
     }
   }
diff --git a/app/styles/components/tabs-bar.scss b/app/styles/components/tabs-bar.scss
index a0226aef8c..0a14c211aa 100644
--- a/app/styles/components/tabs-bar.scss
+++ b/app/styles/components/tabs-bar.scss
@@ -8,7 +8,7 @@
   width: 100%;
   position: sticky;
   top: 0;
-  z-index: 1000;
+  z-index: 1100;
   transition: transform 0.2s ease;
 
   &--collapsed {
@@ -142,11 +142,13 @@
   }
 
   .theme-toggle {
-    @media screen and (max-width: $nav-breakpoint-3) { display: none; }
+    margin-left: 20px;
+
+    @media screen and (max-width: $nav-breakpoint-3) {
+      display: none;
+    }
 
     .setting-toggle {
-      margin-left: 10px;
-
       .react-toggle-track {
         background-color: var(--foreground-color);
       }
@@ -168,7 +170,6 @@
 .tabs-bar__link {
   display: flex;
   flex: 1 1 auto;
-  margin: 0 20px 0 0;
   color: #fff;
   text-decoration: none;
   position: relative;
@@ -183,14 +184,18 @@
     width: 36px;
     margin: 4px 4px 0 0;
     justify-content: center;
-
-    & > span { display: none; }
+    display: none;
   }
 
   > span {
     font-size: 15px;
     line-height: 50px;
     margin-left: 4px;
+    display: none;
+  }
+
+  & + & {
+    margin-left: 20px;
   }
 
   &--search {
@@ -199,28 +204,12 @@
     }
   }
 
-  i.fa {
-    font-size: 14px;
-    transform: translate(-1px, -1px);
-    transition: 0.1s;
+  .svg-icon {
+    width: 22px;
+    height: 22px;
 
-    @media screen and (max-width: 895px) {
-      font-size: 20px;
-    }
-
-    &.fa-home {
-      font-size: 18px;
-      transform: translate(-1px, -2px);
-
-      @media screen and (max-width: 895px) {
-        font-size: 26px;
-      }
-    }
-  }
-
-  .icon-with-counter__counter {
-    @media screen and (min-width: 896px) {
-      left: 5px;
+    svg.icon-tabler {
+      stroke-width: 1.5px;
     }
   }
 
@@ -244,8 +233,8 @@
     height: 15px;
     border-radius: 999px;
     z-index: -1;
-    width: calc(100% + 20px);
-    margin-left: -12px;
+    width: calc(100% + 12px);
+    margin-left: -9px;
 
     @media screen and (max-width: 895px) {
       height: 0;
@@ -339,3 +328,7 @@
     }
   }
 }
+
+.tabs-bar__link + .tabs-bar__profile {
+  margin-left: 20px;
+}
diff --git a/app/styles/ui.scss b/app/styles/ui.scss
index f47c10f87f..62aba15105 100644
--- a/app/styles/ui.scss
+++ b/app/styles/ui.scss
@@ -346,10 +346,11 @@
     width: 100%;
 
     &__top {
+      @include standard-panel-shadow;
       display: flex;
       width: 100%;
       height: auto;
-      z-index: 105;
+      z-index: 1000;
       background: var(--foreground-color);
 
       @media (min-width: 896px) {