diff --git a/src/gnome-shell/gnome-shell-compact.css b/src/gnome-shell/gnome-shell-compact.css
index b60b1ea..beea6c8 100644
--- a/src/gnome-shell/gnome-shell-compact.css
+++ b/src/gnome-shell/gnome-shell-compact.css
@@ -1371,16 +1371,13 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   border-radius: 0 0 0 0;
 }
 
-/* TOP BAR */
 #panel {
   background-color: rgba(0, 0, 0, 0.5);
-  /* transition from solid to transparent */
   transition-duration: 250ms;
   font-weight: bold;
   height: 34px;
   border-radius: 9999px;
   margin: 2px;
-  margin-bottom: 0;
 }
 
 #panel:overview, #panel.unlock-screen, #panel.login-screen, #panel.lock-screen {
@@ -1651,7 +1648,7 @@ Gjs_ui_panel_ActivitiesButton.panel-button:active, Gjs_ui_panel_ActivitiesButton
 
 .datemenu-today-button {
   min-height: 48px;
-  padding: 4px 8px;
+  padding: 4px;
   border-radius: 5px;
   border: none;
   box-shadow: none;
diff --git a/src/gnome-shell/gnome-shell-dark-compact.css b/src/gnome-shell/gnome-shell-dark-compact.css
index b68e33d..71f9776 100644
--- a/src/gnome-shell/gnome-shell-dark-compact.css
+++ b/src/gnome-shell/gnome-shell-dark-compact.css
@@ -1371,16 +1371,13 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   border-radius: 0 0 0 0;
 }
 
-/* TOP BAR */
 #panel {
   background-color: rgba(0, 0, 0, 0.5);
-  /* transition from solid to transparent */
   transition-duration: 250ms;
   font-weight: bold;
   height: 34px;
   border-radius: 9999px;
   margin: 2px;
-  margin-bottom: 0;
 }
 
 #panel:overview, #panel.unlock-screen, #panel.login-screen, #panel.lock-screen {
@@ -1651,7 +1648,7 @@ Gjs_ui_panel_ActivitiesButton.panel-button:active, Gjs_ui_panel_ActivitiesButton
 
 .datemenu-today-button {
   min-height: 48px;
-  padding: 4px 8px;
+  padding: 4px;
   border-radius: 5px;
   border: none;
   box-shadow: none;
diff --git a/src/gnome-shell/gnome-shell-dark.css b/src/gnome-shell/gnome-shell-dark.css
index 1df9d52..cfa11f2 100644
--- a/src/gnome-shell/gnome-shell-dark.css
+++ b/src/gnome-shell/gnome-shell-dark.css
@@ -1371,16 +1371,13 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   border-radius: 0 0 0 0;
 }
 
-/* TOP BAR */
 #panel {
   background-color: rgba(0, 0, 0, 0.5);
-  /* transition from solid to transparent */
   transition-duration: 250ms;
   font-weight: bold;
   height: 38px;
   border-radius: 9999px;
   margin: 3px;
-  margin-bottom: 0;
 }
 
 #panel:overview, #panel.unlock-screen, #panel.login-screen, #panel.lock-screen {
@@ -1651,7 +1648,7 @@ Gjs_ui_panel_ActivitiesButton.panel-button:active, Gjs_ui_panel_ActivitiesButton
 
 .datemenu-today-button {
   min-height: 56px;
-  padding: 6px 8px;
+  padding: 6px;
   border-radius: 5px;
   border: none;
   box-shadow: none;
diff --git a/src/gnome-shell/gnome-shell.css b/src/gnome-shell/gnome-shell.css
index a627fc7..1745b4e 100644
--- a/src/gnome-shell/gnome-shell.css
+++ b/src/gnome-shell/gnome-shell.css
@@ -1371,16 +1371,13 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   border-radius: 0 0 0 0;
 }
 
-/* TOP BAR */
 #panel {
   background-color: rgba(0, 0, 0, 0.5);
-  /* transition from solid to transparent */
   transition-duration: 250ms;
   font-weight: bold;
   height: 38px;
   border-radius: 9999px;
   margin: 3px;
-  margin-bottom: 0;
 }
 
 #panel:overview, #panel.unlock-screen, #panel.login-screen, #panel.lock-screen {
@@ -1651,7 +1648,7 @@ Gjs_ui_panel_ActivitiesButton.panel-button:active, Gjs_ui_panel_ActivitiesButton
 
 .datemenu-today-button {
   min-height: 56px;
-  padding: 6px 8px;
+  padding: 6px;
   border-radius: 5px;
   border: none;
   box-shadow: none;
diff --git a/src/gnome-shell/sass/_common.scss b/src/gnome-shell/sass/_common.scss
index d1b1c62..38c0a92 100644
--- a/src/gnome-shell/sass/_common.scss
+++ b/src/gnome-shell/sass/_common.scss
@@ -61,7 +61,7 @@ stage {
   min-height: $medium_size;
   padding: 0 16px;
   border-width: 0;
-  border-radius: $bt_radius;
+  border-radius: $buttons_radius;
   @include font(button);
   @include button(flat-normal);
   &:hover { @include button(flat-hover); }
@@ -236,7 +236,7 @@ $slider_color: if($variant == 'light', $accent_color, white);
 
 /* links */
 .shell-link {
-  border-radius: $bt_radius;
+  border-radius: $buttons_radius;
   color: $link_color;
   background-color: transparent;
   &:hover {
@@ -320,7 +320,7 @@ $slider_color: if($variant == 'light', $accent_color, white);
 $mdborder_color: if($variant == 'light', transparent, rgba($white, 0.15));
 
 .modal-dialog {
-  border-radius: $bt_radius * 2;
+  border-radius: $buttons_radius * 2;
   color: $fg_color;
   background-color: $base_color;
   border: 2px solid $mdborder_color;
@@ -671,7 +671,7 @@ $mdborder_color: if($variant == 'light', transparent, rgba($white, 0.15));
 
 .audio-selection-device {
   border: 1px solid $border_color;
-  border-radius: $bt_radius;
+  border-radius: $buttons_radius;
   &:active,&:hover,&:focus { background-color: $primary_color; }
 }
 
@@ -775,14 +775,14 @@ $mdborder_color: if($variant == 'light', transparent, rgba($white, 0.15));
     margin: 0 $container_padding;
     color: rgba(black, 0.75);
     background-color: if($variant == 'light', rgba(black, 0.10), rgba(white, 0.95));
-    border-radius: 0 0 $bt_radius $bt_radius;
+    border-radius: 0 0 $buttons_radius $buttons_radius;
     border: none;
     box-shadow: none;
     background-image: none;
 
     .popup-menu-item {
       margin: 0;
-      border-radius: $bt_radius;
+      border-radius: $buttons_radius;
       color: rgba(black, 0.75);
       background-image: none;
 
@@ -799,7 +799,7 @@ $mdborder_color: if($variant == 'light', transparent, rgba($white, 0.15));
       &.selected:active { color: rgba(black, 0.75); }
 
       &:not(:first-child):last-child {
-        border-radius: 0 0 $bt_radius $bt_radius;
+        border-radius: 0 0 $buttons_radius $buttons_radius;
       }
     }
   }
@@ -822,7 +822,7 @@ $mdborder_color: if($variant == 'light', transparent, rgba($white, 0.15));
       background-color: if($variant == 'light', rgba(black, 0.15), #eaeaea);
       color: rgba(black, 0.75);
       font-weight: normal;
-      border-radius: $bt_radius $bt_radius 0 0;
+      border-radius: $buttons_radius $buttons_radius 0 0;
       border: none;
       box-shadow: none;
 
@@ -891,7 +891,7 @@ $mdborder_color: if($variant == 'light', transparent, rgba($white, 0.15));
   -arrow-box-shadow: none; //dreaming. bug #689995
   margin-left: $container_padding;
   background-color: $menu_bg_color;
-  border-radius: $bt_radius;
+  border-radius: $buttons_radius;
   box-shadow: $shadow_3;
 }
 
@@ -911,7 +911,7 @@ $mdborder_color: if($variant == 'light', transparent, rgba($white, 0.15));
   .popup-menu-content {
     margin-left: $container_padding * 1.5;
     background-color: $menu_bg_color;
-    border-radius: $bt_radius;
+    border-radius: $buttons_radius;
     box-shadow: $shadow_3;
   }
 }
@@ -1057,7 +1057,7 @@ $mdborder_color: if($variant == 'light', transparent, rgba($white, 0.15));
 
 .switcher-list .item-box {
   padding: 8px;
-  border-radius: $bt_radius;
+  border-radius: $buttons_radius;
 }
 
 .switcher-list .item-box:outlined {
@@ -1123,14 +1123,14 @@ $mdborder_color: if($variant == 'light', transparent, rgba($white, 0.15));
   background-color: $primary_color;
   color: $inverse_fg_color;
   background-size: 32px;
-  border-radius: $bt_radius;
+  border-radius: $buttons_radius;
 }
 
 .ws-switcher-box {
   height: 48px;
   border: none;
   background: $divider_color;
-  border-radius: $bt_radius;
+  border-radius: $buttons_radius;
 }
 
 %osd-panel {
@@ -1138,7 +1138,7 @@ $mdborder_color: if($variant == 'light', transparent, rgba($white, 0.15));
   background-color: $base_color;
   border: none;
   box-shadow: $shadow_2;
-  border-radius: $bt_radius;
+  border-radius: $buttons_radius;
   padding: 12px;
 }
 
@@ -1160,18 +1160,17 @@ $mdborder_color: if($variant == 'light', transparent, rgba($white, 0.15));
   border-radius: $panel-corner-radius $panel-corner-radius 0 0;
 }
 
-/* TOP BAR */
-
+//
+// TOP BAR
+//
 #panel {
   background-color: $panel_bg_color;
-  /* transition from solid to transparent */
-  transition-duration: 250ms;
+  transition-duration: 250ms; // transition from solid to transparent
   font-weight: bold;
   height: $medium_size + 2px;
-  // box-shadow: $shadow_6;
   border-radius: $circular_radius;
   margin: $container_padding / 2;
-  margin-bottom: 0;
+  // margin-bottom: 0;
 
   &:overview,
   &.unlock-screen,
@@ -1404,7 +1403,7 @@ Gjs_ui_panel_ActivitiesButton.panel-button {
 
 .datemenu-today-button {
   min-height: $menuitem_size * 2 - 4px * 2;
-  padding: $container_padding 8px;
+  padding: $container_padding;
   border-radius: $material_radius;
   border: none;
   box-shadow: none;
@@ -1438,7 +1437,7 @@ Gjs_ui_panel_ActivitiesButton.panel-button {
   height: $menuitem_size - 4px * 2;
   margin: 2px;
   padding: 6px 16px;
-  border-radius: $bt_radius;
+  border-radius: $buttons_radius;
   color: $secondary_fg_color;
   font-weight: bold;
   text-align: center;
@@ -1733,7 +1732,7 @@ Gjs_ui_panel_ActivitiesButton.panel-button {
   min-height: $menuitem_size * 2;
   background-color: transparent;
   border: none;
-  border-radius: $bt_radius;
+  border-radius: $buttons_radius;
   color: $secondary_fg_color;
   text-shadow: none;
 
@@ -1824,7 +1823,7 @@ Gjs_ui_panel_ActivitiesButton.panel-button {
     icon-size: 16px !important;
     padding: 8px;
     border: none;
-    border-radius: $bt_radius;
+    border-radius: $buttons_radius;
     background-color: $divider_color;
     color: $hint_fg_color;
   }
@@ -1931,7 +1930,7 @@ Gjs_ui_panel_ActivitiesButton.panel-button {
 .nm-dialog-item {
   font-size: 1em;
   border-bottom: none;
-  border-radius: $bt_radius;
+  border-radius: $buttons_radius;
   padding: 12px;
   spacing: 20px;
 
@@ -1983,7 +1982,7 @@ Gjs_ui_panel_ActivitiesButton.panel-button {
   spacing: 25px;
   color: $inverse_fg_color;
   background-color: $bg_color;
-  border-radius: $bt_radius;
+  border-radius: $buttons_radius;
   padding: 4px 8px;
   border: none;
   font-size: 1em;
@@ -2038,16 +2037,18 @@ Gjs_ui_panel_ActivitiesButton.panel-button {
 .search-section-content { // This is the space between the provider icon and the results container
   spacing: 32px;
   background-color: $inverse_divider_color;
-  border-radius: $bt_radius;
+  border-radius: $buttons_radius;
   border: none;
   box-shadow: none;
   text-shadow: none;
   color: $inverse_fg_color;
   padding: 12px;
 }
+
 .search-statustext { // "no results"
   @extend %status_text;
 }
+
 .list-search-results { spacing: 3px; }
 
 .search-section-separator { height: 0; }
@@ -2140,6 +2141,7 @@ Gjs_ui_panel_ActivitiesButton.panel-button {
   border-radius: 100px;
   background-color: $inverse_divider_color;
 }
+
 .app-view-control { //favorties | all toggle button
   padding: 0 16px;
   margin: 3px;
@@ -2214,7 +2216,7 @@ StWidget.focused .app-well-app-running-dot {
 
 %icon_tile {
   color: $inverse_fg_color;
-  border-radius: $bt_radius;
+  border-radius: $buttons_radius;
   padding: 6px;
   border: none;
   transition-duration: $longer_duration;
@@ -2235,7 +2237,7 @@ StWidget.focused .app-well-app-running-dot {
 
 // Collections
 .app-folder-popup { //expanded collection
-  -arrow-border-radius: $bt_radius;
+  -arrow-border-radius: $buttons_radius;
   -arrow-background-color: $inverse_bg_color;
   -arrow-base: 0;
   -arrow-rise: 12px;
@@ -2303,7 +2305,7 @@ StWidget.focused .app-well-app-running-dot {
 
   .overview-icon {
     background-color: $inverse_bg_color;
-    border-radius: $bt_radius * 2;
+    border-radius: $buttons_radius * 2;
   }
 
   &:hover .overview-icon {
@@ -2313,7 +2315,7 @@ StWidget.focused .app-well-app-running-dot {
 
 // expanded folder
 .app-folder-dialog {
-  border-radius: $bt_radius * 4;
+  border-radius: $buttons_radius * 4;
   border: 2px solid rgba(white, 0.15);
   padding: 12px;
   background-color: rgba(#222, 0.95);
@@ -2420,7 +2422,7 @@ StWidget.focused .app-well-app-running-dot {
   visible-width: 32px; //amount visible before hover
   spacing: 12px;
   padding: 16px;
-  border-radius: $bt_radius;
+  border-radius: $buttons_radius;
   margin: 6px;
   //border-width: 0; //fixme: can't have non unoform borders :(
   // &:rtl { border-radius: $material_radius; }
@@ -2467,7 +2469,7 @@ StWidget.focused .app-well-app-running-dot {
   width: 34em;
   min-height: $menuitem_size * 2;
   margin: 5px;
-  border-radius: $bt_radius;
+  border-radius: $buttons_radius;
   color: $fg_color;
   background-color: rgba($base_color, 0.92);
   border: none;
@@ -2494,11 +2496,11 @@ StWidget.focused .app-well-app-running-dot {
     font-weight: 500;
     border-width: 0;
 
-    &:first-child { border-radius: 0 0 0 $bt_radius; }
+    &:first-child { border-radius: 0 0 0 $buttons_radius; }
 
-    &:last-child { border-radius: 0 0 $bt_radius 0; }
+    &:last-child { border-radius: 0 0 $buttons_radius 0; }
 
-    &:only-child, &:first-child:last-child { border-radius: 0 0 $bt_radius $bt_radius; }
+    &:only-child, &:first-child:last-child { border-radius: 0 0 $buttons_radius $buttons_radius; }
 
     &:focus {
       background-color: transparent;
@@ -2568,16 +2570,16 @@ StWidget.focused .app-well-app-running-dot {
 
   // radius is 2 pixel less to fit in bubble
   &:first-child {
-    border-radius: 0 0 0 $bt_radius;
+    border-radius: 0 0 0 $buttons_radius;
   }
 
   &:last-child {
     border-right-width: 0;
-    border-radius: 0 0 $bt_radius 0;
+    border-radius: 0 0 $buttons_radius 0;
   }
 
   &:first-child:last-child {
-    border-radius: 0 0 $bt_radius $bt_radius;
+    border-radius: 0 0 $buttons_radius $buttons_radius;
   }
 }
 
@@ -2602,7 +2604,7 @@ StWidget.focused .app-well-app-running-dot {
 
 .hotplug-resident-mount {
   spacing: 8px;
-  border-radius: $bt_radius;
+  border-radius: $buttons_radius;
   &:hover { background-color: $divider_color; }
   &:active { background-color: $track_color; }
 }
@@ -2623,7 +2625,7 @@ StWidget.focused .app-well-app-running-dot {
 
 .hotplug-resident-eject-button {
   padding: 7px;
-  border-radius: $bt_radius;
+  border-radius: $buttons_radius;
   color: $fg_color;
 }
 
@@ -2676,7 +2678,7 @@ $keyboard_active_bg_color: if($variant == 'light', darken($keyboard_bg_color, 20
   min-width: 2em;
   font-size: 14pt;
   font-weight: bold;
-  border-radius: $bt_radius;
+  border-radius: $buttons_radius;
   border: none;
   color: inherit;
   background-color: $keyboard_bg_color;
@@ -2709,7 +2711,7 @@ $keyboard_active_bg_color: if($variant == 'light', darken($keyboard_bg_color, 20
 
 .keyboard-subkeys { //long press on a key popup
   color: inherit;
-  -arrow-border-radius: $bt_radius;
+  -arrow-border-radius: $buttons_radius;
   -arrow-background-color: rgba(black, 0.45);
   -arrow-border-width: 0;
   -arrow-border-color: transparent;
@@ -2752,7 +2754,7 @@ $keyboard_active_bg_color: if($variant == 'light', darken($keyboard_bg_color, 20
   transition-duration: 0ms; // FIXME: needs more natural transitions
   min-height: $menuitem_size;
   padding: 0 8px;
-  border-radius: $bt_radius;
+  border-radius: $buttons_radius;
   &:hover { background-color: $divider_color; color: $fg_color; }
   &:active { background-color: $track_color; color: $fg_color; }
   &:selected { background-color: $primary_color; color: $inverse_fg_color; }
@@ -2770,8 +2772,8 @@ $keyboard_active_bg_color: if($variant == 'light', darken($keyboard_bg_color, 20
   padding: 0;
 }
 
-.candidate-page-button-previous { border-radius: $bt_radius; border-right-width: 0; }
-.candidate-page-button-next { border-radius: $bt_radius;  }
+.candidate-page-button-previous { border-radius: $buttons_radius; border-right-width: 0; }
+.candidate-page-button-next { border-radius: $buttons_radius;  }
 .candidate-page-button-icon { icon-size: em(16px); }
 
 /* Auth Dialogs & Screen Shield */
@@ -2860,7 +2862,7 @@ $keyboard_active_bg_color: if($variant == 'light', darken($keyboard_bg_color, 20
   &:expanded .login-dialog-user-list-item:logged-in { border-right: 2px solid $inverse_fg_color; }
 }
 .login-dialog-user-list-item {
-  border-radius: $bt_radius;
+  border-radius: $buttons_radius;
   padding: 6px;
   color: $inverse_secondary_fg_color;
   &:ltr { padding-right: 1em; }
@@ -2955,7 +2957,7 @@ $keyboard_active_bg_color: if($variant == 'light', darken($keyboard_bg_color, 20
     border: none;
     background-color: $alt_bg_color;
     color: $inverse_fg_color;
-    border-radius: $bt_radius;
+    border-radius: $buttons_radius;
   }
   .notification { margin-right: 16px; } //compensate for space allocated to the scrollbar
 }
@@ -3022,7 +3024,7 @@ $keyboard_active_bg_color: if($variant == 'light', darken($keyboard_bg_color, 20
     border: none;
     background-color: $bg_color;
     color: $inverse_fg_color;
-    border-radius: $bt_radius;
+    border-radius: $buttons_radius;
 
     &.critical { background-color: $alt_bg_color; }
   }
@@ -3058,7 +3060,7 @@ $keyboard_active_bg_color: if($variant == 'light', darken($keyboard_bg_color, 20
   spacing: 4px;
   padding: 6px;
   border: none;
-  border-radius: $bt_radius;
+  border-radius: $buttons_radius;
   box-shadow: $shadow_4;
 
   & > #Toolbar {
@@ -3127,7 +3129,7 @@ $keyboard_active_bg_color: if($variant == 'light', darken($keyboard_bg_color, 20
   min-height: $medium_size;
   padding: 0 16px;
   border: none;
-  border-radius: $bt_radius;
+  border-radius: $buttons_radius;
   @include font(button);
   @include button(flat-normal);
   &:hover { @include button(flat-hover); }
@@ -3146,7 +3148,7 @@ $keyboard_active_bg_color: if($variant == 'light', darken($keyboard_bg_color, 20
 
 .lg-extension {
   border: none;
-  border-radius: $bt_radius;
+  border-radius: $buttons_radius;
   background-color: $alt_base_color;
   padding: 4px;
 }
@@ -3162,7 +3164,7 @@ $keyboard_active_bg_color: if($variant == 'light', darken($keyboard_bg_color, 20
 #LookingGlassPropertyInspector {
   background: $base_color;
   border: none;
-  border-radius: $bt_radius;
+  border-radius: $buttons_radius;
   padding: 6px;
   box-shadow: $shadow_4;
 }
diff --git a/src/gnome-shell/sass/_variables.scss b/src/gnome-shell/sass/_variables.scss
index b5acba3..37b90f9 100644
--- a/src/gnome-shell/sass/_variables.scss
+++ b/src/gnome-shell/sass/_variables.scss
@@ -33,7 +33,7 @@ $menuitem_size: if($laptop == 'false', 32px, 28px);
 
 // radiuses
 $material_radius: 5px;
-$bt_radius: 12px;
+$buttons_radius: 12px;
 $circular_radius: 9999px;
 
 // durations