diff --git a/data/theme/_common.scss b/data/theme/_common.scss
index 224a066c4..ec55a1066 100644
--- a/data/theme/_common.scss
+++ b/data/theme/_common.scss
@@ -1215,7 +1215,7 @@ StScrollBar {
 /* LOGIN DIALOG */
 .login-dialog-banner-view {
   padding-top: 24px;
-   max-width: 23em;
+  max-width: 23em;
 }
 
 /* NOTIFICATIONS & MESSAGE TRAY */
@@ -1330,12 +1330,16 @@ StScrollBar {
     &:ltr > StScrollBar { padding-left: 6px; }
     &:rtl > StScrollBar { padding-right: 6px; }
   }
-  .notification-button { -st-natural-width: 140px; }
+  .notification-button {
+    //-st-natural-width: 140px;
+    height: 24px;
+  }
   .notification-icon-button { 
     border-radius: 5px; 
     padding: 5px;
+    height: 24px; width: 24px;
     &:focus { }//FIXME
-    & > StIcon { icons-size: 16px; padding: 8px; }
+    & > StIcon { icons-size: 16px; width: 16px; height: 16px; padding: 2px; }
   }
   .secondary-icon { icon-size: 1.09em; } //FIXME
 
diff --git a/data/theme/gnome-shell-high-contrast.css b/data/theme/gnome-shell-high-contrast.css
index e51b420f7..9c9e08ceb 100644
--- a/data/theme/gnome-shell-high-contrast.css
+++ b/data/theme/gnome-shell-high-contrast.css
@@ -1595,14 +1595,18 @@ StScrollBar {
     padding-right: 6px; }
 
 .notification-button {
-  -st-natural-width: 140px; }
+  height: 24px; }
 
 .notification-icon-button {
   border-radius: 5px;
-  padding: 5px; }
+  padding: 5px;
+  height: 24px;
+  width: 24px; }
   .notification-icon-button > StIcon {
     icons-size: 16px;
-    padding: 8px; }
+    width: 16px;
+    height: 16px;
+    padding: 2px; }
 
 .secondary-icon {
   icon-size: 1.09em; }
diff --git a/data/theme/gnome-shell.css b/data/theme/gnome-shell.css
index 02091f539..09fb273e6 100644
--- a/data/theme/gnome-shell.css
+++ b/data/theme/gnome-shell.css
@@ -1587,14 +1587,18 @@ StScrollBar {
     padding-right: 6px; }
 
 .notification-button {
-  -st-natural-width: 140px; }
+  height: 24px; }
 
 .notification-icon-button {
   border-radius: 5px;
-  padding: 5px; }
+  padding: 5px;
+  height: 24px;
+  width: 24px; }
   .notification-icon-button > StIcon {
     icons-size: 16px;
-    padding: 8px; }
+    width: 16px;
+    height: 16px;
+    padding: 2px; }
 
 .secondary-icon {
   icon-size: 1.09em; }