diff --git a/Resources/Plugins/clear-columns/browser.js b/Resources/Plugins/clear-columns/browser.js
index b4833248..792cf454 100644
--- a/Resources/Plugins/clear-columns/browser.js
+++ b/Resources/Plugins/clear-columns/browser.js
@@ -82,12 +82,10 @@ enabled(){
 </a>`;
   
   // add column buttons and keyboard shortcut info to UI
-  window.TDPF_injectMustache("column/column_header.mustache", "prepend", "</header>", `
-{{^isTemporary}}
-  <a class="column-header-link td-clear-column-shortcut" href="#" data-action="td-clearcolumns-dosingle" style="right:34px">
-    <i class="icon icon-clear-timeline js-show-tip" data-placement="bottom" data-original-title="Clear column (hold Shift to restore)"></i>
-  </a>
-{{/isTemporary}}`);
+  window.TDPF_injectMustache("column/column_header.mustache", "prepend", "<a data-testid=\"optionsToggle\"", `
+<a class="js-action-header-button column-header-link" href="#" data-action="td-clearcolumns-dosingle">
+  <i class="icon icon-clear-timeline js-show-tip" data-placement="bottom" data-original-title="Clear column (hold Shift to restore)"></i>
+</a>`);
   
   window.TDPF_injectMustache("keyboard_shortcut_list.mustache", "prepend", "</dl> <dl", `
 <dd class="keyboard-shortcut-definition" style="white-space:nowrap">
@@ -103,11 +101,8 @@ enabled(){
   css.insert(".js-app-add-column.is-hidden + .clear-columns-btn-all-parent { display: none; }");
   css.insert(".column-navigator-overflow .clear-columns-btn-all-parent { display: none !important; }");
   css.insert(".column-navigator-overflow { bottom: 224px !important; }");
-  css.insert(".column-title { margin-right: 60px !important; }");
-  css.insert(".mark-all-read-link { right: 59px !important; }");
-  css.insert(".open-compose-dm-link { right: 90px !important; }");
-  css.insert("button[data-action='clear'].btn-options-tray { display: none !important; }");
-  css.insert("[data-td-icon='icon-message'] .column-title { margin-right: 115px !important; }");
+  css.insert("[data-action='td-clearcolumns-dosingle'] { padding: 3px 0 !important; }");
+  css.insert("[data-action='clear'].btn-options-tray { display: none !important; }");
   css.insert("[data-td-icon='icon-schedule'] .td-clear-column-shortcut { display: none; }");
   css.insert("[data-td-icon='icon-custom-timeline'] .td-clear-column-shortcut { display: none; }");
 }
diff --git a/Resources/Plugins/edit-design/browser.js b/Resources/Plugins/edit-design/browser.js
index 725d7d93..4fa84dc6 100644
--- a/Resources/Plugins/edit-design/browser.js
+++ b/Resources/Plugins/edit-design/browser.js
@@ -539,8 +539,8 @@ ${iconData.map(entry => `#tduck .icon-${entry[0]}:before{content:\"\\f0${entry[1
 #tduck .js-docked-compose .js-drawer-close { margin: 20px 0 0 !important }
 #tduck .search-input-control .icon { font-size: 20px !important; top: -4px !important }
 
-.column-header .column-type-icon { bottom: 26px !important }
-.is-options-open .column-type-icon { bottom: 25px !important }
+.column-type-icon { margin-top: -1px !important }
+.inline-reply .pull-left .Button--link { margin-top: 3px !important }
 
 .tweet-action-item .icon-favorite-toggle { font-size: 16px !important; }
 .tweet-action-item .heartsprite { top: -260% !important; left: -260% !important; transform: scale(0.4, 0.39) translateY(0.5px) !important; }
diff --git a/Resources/Scripts/styles/browser.css b/Resources/Scripts/styles/browser.css
index a43bccc8..4afd9d2b 100644
--- a/Resources/Scripts/styles/browser.css
+++ b/Resources/Scripts/styles/browser.css
@@ -150,6 +150,7 @@ button {
 
 .activity-header .icon-user-filled {
   vertical-align: sub !important;
+  margin-right: 4px !important;
 }
 
 html[data-td-theme='light'] .stream-item:not(:hover) .js-user-actions-menu {
@@ -234,6 +235,31 @@ a[data-full-url] {
   vertical-align: -10% !important;
 }
 
+.column-title {
+  /* fix alignment of everything in column headers */
+  padding-top: 1px !important;
+}
+
+.column-title .attribution {
+  /* fix alignment of usernames in column headers */
+  margin: 0 0 0 6px !important;
+}
+
+.app-navigator .tooltip {
+  /* fix tooltips in navigation */
+  display: none !important;
+}
+
+.column-header-links .icon {
+  /* fix tooltips in column headers */
+  height: calc(1em + 8px) !important;
+}
+
+.js-column-options .btn-options-tray {
+  /* fix underline on buttons in column options */
+  text-decoration: none !important;
+}
+
 #tduck .nav-user-info .hide-condensed {
   /* move login account info */
   margin: 0px !important;
@@ -290,9 +316,9 @@ html[data-td-font='smallest'] .tweet-detail-wrapper .badge-verified:before {
 /* Fix glaring visual issues that twitter hasn't fixed yet smh */
 /***************************************************************/
 
-.column-nav-link .attribution {
+.js-column-nav-list .attribution {
   /* fix cut off account names */
-  position: absolute !important;
+  line-height: 1.1 !important;
 }
 
 #tduck .js-docked-compose .js-drawer-close {
@@ -311,25 +337,6 @@ html[data-td-font='smallest'] .tweet-detail-wrapper .badge-verified:before {
   vertical-align: -15% !important;
 }
 
-/************************************************/
-/* Fix tooltips in navigation and column header */
-/************************************************/
-
-.app-navigator .tooltip {
-  display: none !important;
-}
-
-.js-column-header .column-header-link {
-  padding: 0 !important;
-}
-
-.js-column-header .column-header-link .icon {
-  width: calc(1em + 8px);
-  height: 100%;
-  padding: 9px 4px;
-  box-sizing: border-box;
-}
-
 /*******************************************/
 /* Fix one pixel space below column header */
 /*******************************************/
@@ -342,10 +349,6 @@ html[data-td-font='smallest'] .tweet-detail-wrapper .badge-verified:before {
   border-bottom: none !important;
 }
 
-.is-options-open .column-type-icon {
-  bottom: 27px !important;
-}
-
 /********************************************/
 /* Fix cut off usernames in Messages column */
 /********************************************/
diff --git a/Resources/Scripts/styles/notification.css b/Resources/Scripts/styles/notification.css
index 065a86e2..ca717f2b 100644
--- a/Resources/Scripts/styles/notification.css
+++ b/Resources/Scripts/styles/notification.css
@@ -90,6 +90,7 @@ html[data-td-font='smallest'] .badge-verified:before {
 
 .activity-header .icon-user-filled {
   vertical-align: sub !important;
+  margin-right: 4px !important;
 }
       
 .td-notification-padded .item-img {