diff --git a/data/gnome-classic.css b/data/gnome-classic.css
index aadcb654..a232541d 100644
--- a/data/gnome-classic.css
+++ b/data/gnome-classic.css
@@ -1740,6 +1740,7 @@ StScrollBar {
 
 /* Overrides */
 #panel {
+  font-weight: normal;
   background-color: #ededed;
   background-gradient-direction: vertical;
   background-gradient-end: #e0e0e0;
@@ -1758,6 +1759,9 @@ StScrollBar {
     #panel:overview .panel-button {
       color: #fff; }
   #panel .panel-button {
+    -natural-hpadding: 8px;
+    -minimum-hpadding: 4px;
+    font-weight: normal;
     color: #2e3436; }
     #panel .panel-button:active, #panel .panel-button:overview, #panel .panel-button:focus, #panel .panel-button:checked {
       background-color: #4a90d9 !important;
@@ -1765,6 +1769,10 @@ StScrollBar {
       box-shadow: none; }
       #panel .panel-button:active > .system-status-icon, #panel .panel-button:overview > .system-status-icon, #panel .panel-button:focus > .system-status-icon, #panel .panel-button:checked > .system-status-icon {
         icon-shadow: none; }
+    #panel .panel-button .app-menu-icon {
+      width: 0;
+      height: 0;
+      margin: 0; }
   #panel .panel-corner,
   #panel .panel-corner:active,
   #panel .panel-corner:overview,
@@ -1777,6 +1785,13 @@ StScrollBar {
     #panel.lock-screen .panel-button, #panel.unlock-screen .panel-button, #panel.login-screen .panel-button {
       color: #eeeeec; }
 
+#appMenu {
+  padding: 0 8px 0 8px; }
+
+.popup-menu-arrow {
+  width: 0;
+  height: 0; }
+
 .tile-preview-left.on-primary,
 .tile-preview-right.on-primary,
 .tile-preview-left.tile-preview-right.on-primary {
diff --git a/data/gnome-classic.scss b/data/gnome-classic.scss
index 44e87ac3..f1c5d2a3 100644
--- a/data/gnome-classic.scss
+++ b/data/gnome-classic.scss
@@ -8,6 +8,7 @@ $variant: 'light';
 /* Overrides */
 
 #panel {
+  font-weight: normal;
   background-color: $bg_color;
   background-gradient-direction: vertical;
   background-gradient-end: darken($bg_color,5%);
@@ -26,6 +27,9 @@ $variant: 'light';
   }
 
   .panel-button {
+    -natural-hpadding: 8px;
+    -minimum-hpadding: 4px;
+    font-weight: normal;
     color: $fg_color;
     &:active, &:overview, &:focus, &:checked {
       // Trick due to St limitations. It needs a background to draw
@@ -35,13 +39,14 @@ $variant: 'light';
       box-shadow: none;
       & > .system-status-icon { icon-shadow: none; }
     }
+    .app-menu-icon { width: 0; height: 0; margin: 0; } // shell's display:none; :D
   }
-  
+
   .panel-corner,
   .panel-corner:active,
   .panel-corner:overview,
   .panel-corner:focus {
-      -panel-corner-radius: 0;
+    -panel-corner-radius: 0;
   }
   &.lock-screen,
   &.unlock-screen, 
@@ -53,6 +58,9 @@ $variant: 'light';
   }
 }
 
+#appMenu { padding: 0 8px 0 8px; }
+.popup-menu-arrow { width: 0; height: 0;  } // shell's display: none;
+
 .tile-preview-left.on-primary,
 .tile-preview-right.on-primary,
 .tile-preview-left.tile-preview-right.on-primary {