diff --git a/src/sass/gnome-shell/common/_calendar.scss b/src/sass/gnome-shell/common/_calendar.scss
index 6797122..20e5a67 100644
--- a/src/sass/gnome-shell/common/_calendar.scss
+++ b/src/sass/gnome-shell/common/_calendar.scss
@@ -39,30 +39,29 @@ $popover_bubble_bg: if($variant == 'light', rgba(white, 0.95), rgba(lighten($bas
   }
 }
 
-.clock-display-box {
-  spacing: 2px;
-
-  .clock {
-    padding-left: $base_padding * 2;
-    padding-right: $base_padding * 2;
-  }
-}
-
 // overall menu
 #calendarArea {
-  padding: $base_padding * 1.5 0;
+  padding: 4px 0;
 }
 
 // Calendar menu side column
 .datemenu-calendar-column {
   spacing: $base_spacing;
   border: 0 solid $borders_color;
-  padding: 0 0 0 $base_padding * 2;
 
-  &:ltr { margin-right: $base_margin * 2; border-left-width: 0; }
-  &:rtl { margin-left: $base_margin * 2; border-right-width: 0; }
+  &:ltr {
+    margin-right: 0;
+    padding-left: 0;
+    border-left-width: 0;
+  }
 
-  .datemenu-displays-section { padding-bottom: 0; }
+  &:rtl {
+    margin-left: 0;
+    padding-right: 0;
+    border-right-width: 0;
+  }
+
+  .datemenu-displays-section { padding: 0; }
 
   .datemenu-displays-box {
     spacing: $base_spacing;
@@ -121,7 +120,7 @@ $popover_bubble_bg: if($variant == 'light', rgba(white, 0.95), rgba(lighten($bas
   box-shadow: 0 1px 2px rgba(black, 0.02) !important;
   background-color: $popover_bubble_bg;
   padding: $base_padding !important;
-  margin: 0 12px !important;
+  margin: 0 $base_padding + $base_margin + 4px !important;
   text-shadow: none;
   border-radius: $mn_radius;
 
@@ -286,7 +285,7 @@ $popover_bubble_bg: if($variant == 'light', rgba(white, 0.95), rgba(lighten($bas
 .events-button {
   @extend %popover_bubble;
   padding: $base_padding * 2 !important;
-  margin: 2px 4px !important;
+  margin: 3px 4px !important;
 }
 
 // Events
@@ -345,8 +344,6 @@ $popover_bubble_bg: if($variant == 'light', rgba(white, 0.95), rgba(lighten($bas
 
 // Weather
 .weather-button {
-  margin-bottom: 6px !important;
-
   .weather-box {
     spacing: $base_spacing + $base_margin;
   }
diff --git a/src/sass/gnome-shell/common/_message-list.scss b/src/sass/gnome-shell/common/_message-list.scss
index 17059e7..2649b96 100644
--- a/src/sass/gnome-shell/common/_message-list.scss
+++ b/src/sass/gnome-shell/common/_message-list.scss
@@ -3,16 +3,29 @@
 
 .message-list {
   width: 31.5em;
-  padding: $base_padding * 1.5 0;
+  padding: 0 $base_margin;
   text-shadow: none;
   border: none;
 
   // padding and margins to account for scrollbar
-  &:ltr { margin-left: 0; margin-right: 0; padding-right: 0; }
-  &:rtl { margin-right: 0; margin-left: 0; padding-left: 0; }
+  &:ltr {
+    margin-left: 0;
+    margin-right: 0;
+    padding-right: 0;
+    border-right-width: 0;
+  }
+
+  &:rtl {
+    margin-right: 0;
+    margin-left: 0;
+    padding-left: 0;
+    border-left-width: 0;
+  }
 
   .message-list-placeholder {
-    spacing: 12px;
+    font-weight: 800;
+    @include fontsize(15);
+    color: $disabled_fg_color;
 
     // icon size and color
     > StIcon {
@@ -24,11 +37,16 @@
 }
 
 .message-list-sections {
-  margin: 0 $base_margin * 4; // to account for scrollbar
+  spacing: $base_padding;
+  margin: 0;
+  padding-bottom: $base_padding;
+
+  // to account for scrollbar
+  &:ltr { margin-right: $base_margin !important; }
+  &:rtl { margin-left: $base_margin !important; }
 }
 
 .message-list-section,
-.message-list-sections,
 .message-list-section-list {
   spacing: $base_spacing;
 }
@@ -48,7 +66,7 @@
 
 // message bubbles
 .message {
-  margin: 3px 4px 4px;
+  margin: 3px 4px;
 
   .popup-menu & {
     @extend %popover_bubble;
diff --git a/src/sass/gnome-shell/common/_panel.scss b/src/sass/gnome-shell/common/_panel.scss
index 2e22d63..03b4374 100644
--- a/src/sass/gnome-shell/common/_panel.scss
+++ b/src/sass/gnome-shell/common/_panel.scss
@@ -134,7 +134,11 @@ $panel_height: $menuitem_size;
     &.clock-display {
       background-color: transparent;
 
-      StLabel { padding: 0 $base_padding; }
+      &, .clock-display-box {
+        spacing: 0 !important;
+        padding: 0 !important;
+        margin: 0 !important;
+      }
 
       .clock {
         // transition-duration: 150ms;
@@ -142,8 +146,8 @@ $panel_height: $menuitem_size;
         border-radius: $bt_radius;
         background-color: transparent;
         box-shadow: none;
-        padding: 0 $base_padding * 3;
-        spacing: $base_padding;
+        padding: 0 $base_padding + 12px !important;
+        margin: 0 !important;
       }
     }