diff --git a/dist/css/layout/core_navigation.css b/dist/css/layout/core_navigation.css
index f684234fcc094cfa23464285c766bba585826405..1fa8c48eec957de791c2edd6970ccecb19012ab2 100644
--- a/dist/css/layout/core_navigation.css
+++ b/dist/css/layout/core_navigation.css
@@ -452,7 +452,7 @@ body.gin--core-navigation {
 }
 
 #navigation-block-shortcuts,
-#navigation-link-announcements-feedannouncement,
+#toolbar-item-announcement,
 .toolbar-block:has(.admin-toolbar__item:first-of-type:last-of-type > #menu--shortcuts) {
   display: none;
 }
@@ -473,7 +473,8 @@ body.gin--core-navigation {
   border-inline-start: none;
 }
 
-.toolbar-loading #toolbar-item-shortcuts-tray {
+.toolbar-loading #toolbar-item-shortcuts-tray,
+.toolbar-loading #toolbar-item-shortcuts {
   visibility: hidden;
 }
 
diff --git a/dist/css/theme/variables.css b/dist/css/theme/variables.css
index 66934606c9cc02061e41245e22113bf63c2a5e97..34d68c2e6ed4b4eec234a9855c54ddf15268defa 100644
--- a/dist/css/theme/variables.css
+++ b/dist/css/theme/variables.css
@@ -221,7 +221,7 @@
   --gin-border-color-layer: rgba(0, 0, 0, .05);
   --gin-border-color-layer2: #76777b;
   --gin-border-color-table: #43454a;
-  --gin-border-color-table-header: rgba(255, 255, 255, .12);
+  --gin-border-color-table-header: rgba(255, 255, 255, .4);
   --gin-border-color-form-element: var(--gin-border-color-layer2);
   --gin-bg-header: #1b1b1d;
   --gin-switch: var(--gin-color-primary);
diff --git a/styles/layout/core_navigation.scss b/styles/layout/core_navigation.scss
index a8d1094659e81307ba6981428fcd9d92c89b4a6d..09c88872aac7ec3c910d35df1b58e5ebf7b81d84 100644
--- a/styles/layout/core_navigation.scss
+++ b/styles/layout/core_navigation.scss
@@ -306,9 +306,12 @@ body.gin--core-navigation {
 // --------------------------------------------------
 // Hide Shortcuts & Announcements in primary nav
 // --------------------------------------------------
+// #toolbar-item-shortcuts,
 #navigation-block-shortcuts,
-#navigation-link-announcements-feedannouncement,
-.toolbar-block:has(.admin-toolbar__item:first-of-type:last-of-type > #menu--shortcuts) {
+#toolbar-item-announcement,
+// #navigation-link-announcements-feedannouncement,
+.toolbar-block:has(.admin-toolbar__item:first-of-type:last-of-type > #menu--shortcuts)
+{
   display: none;
 }
 
@@ -336,6 +339,7 @@ body.gin--core-navigation {
 }
 
 // Fix weird shortcuts menu flickering.
-.toolbar-loading #toolbar-item-shortcuts-tray {
+.toolbar-loading #toolbar-item-shortcuts-tray,
+.toolbar-loading #toolbar-item-shortcuts {
   visibility: hidden;
 }
diff --git a/styles/theme/variables.scss b/styles/theme/variables.scss
index 69e141c32970b768ff5137c4d6ee2d9ff320d565..0ea76c019678c456546471dfbb0322e53074a843 100644
--- a/styles/theme/variables.scss
+++ b/styles/theme/variables.scss
@@ -276,7 +276,7 @@
   --gin-border-color-table: #43454a;
 
   // Tabs
-  --gin-border-color-table-header: rgba(255, 255, 255, .12);
+  --gin-border-color-table-header: rgba(255, 255, 255, .4);
 
   // Form element
   --gin-border-color-form-element: var(--gin-border-color-layer2);