diff --git a/src/sass/gnome-shell/common/_calendar.scss b/src/sass/gnome-shell/common/_calendar.scss
index f88fb68..a72dbdf 100644
--- a/src/sass/gnome-shell/common/_calendar.scss
+++ b/src/sass/gnome-shell/common/_calendar.scss
@@ -76,8 +76,7 @@ $popover_bubble_bg: if($variant == 'light', rgba(white, 0.95), rgba(lighten($bas
 }
 
 .datemenu-today-button,
-.datemenu-displays-box,
-.message-list-sections {
+.datemenu-displays-box {
   margin: 4px 8px;
 }
 
@@ -120,7 +119,7 @@ $popover_bubble_bg: if($variant == 'light', rgba(white, 0.95), rgba(lighten($bas
   box-shadow: none !important;
   background-color: transparent;
   padding: $base_padding !important;
-  // margin: 0 4px !important;
+  margin: 0 4px !important;
   text-shadow: none;
   // border-radius: $base_border_radius;
 
@@ -285,7 +284,7 @@ $popover_bubble_bg: if($variant == 'light', rgba(white, 0.95), rgba(lighten($bas
 .events-button {
   @extend %popover_bubble;
   padding: $base_padding * 3 !important;
-  margin-top: $base_padding !important;
+  margin: 3px 4px !important;
 }
 
 // Events
diff --git a/src/sass/gnome-shell/common/_login-dialog.scss b/src/sass/gnome-shell/common/_login-dialog.scss
index 1600e6c..de63e51 100644
--- a/src/sass/gnome-shell/common/_login-dialog.scss
+++ b/src/sass/gnome-shell/common/_login-dialog.scss
@@ -10,13 +10,9 @@
       icon-size: $base_icon_size * 8;
 
       & StIcon {
-        padding: $base_padding * 4;
+        padding: 24px;
         width: $base_icon_size * 5;
-        height:  $base_icon_size * 5;
-      }
-
-      &.user-avatar {
-        border: 4px solid $osd_fg_color;
+        height: $base_icon_size * 5;
       }
     }
   }
@@ -33,20 +29,6 @@
 }
 
 .unlock-dialog {
-  .user-icon {
-    icon-size: $base_icon_size * 4 !important;
-
-    & StIcon {
-      padding: $base_padding * 2 !important;
-      width: $base_icon_size * 2.5 !important;
-      height:  $base_icon_size * 2.5 !important;
-    }
-
-    &.user-avatar {
-      border: 2px solid $osd_fg_color !important;
-    }
-  }
-
   StEntry {
     @include fontsize($base_font_size - 1);
     padding: 0 $base_padding * 2 !important;
diff --git a/src/sass/gnome-shell/common/_misc.scss b/src/sass/gnome-shell/common/_misc.scss
index b81fb5a..22d6b15 100644
--- a/src/sass/gnome-shell/common/_misc.scss
+++ b/src/sass/gnome-shell/common/_misc.scss
@@ -15,18 +15,20 @@
   icon-size: $base_icon_size * 4; // 64px
 
   &:hover {
-    color: lighten($osd_fg_color,30%);
+    color: lighten($osd_fg_color, 30%);
   }
 
   & StIcon {
     background-color: $light_track_color;
     border-radius: $circular_radius;
     padding: $base_padding * 2; // 12px
-    width: $base_icon_size * 2.5; height:  $base_icon_size * 2.5; // 40px;
+    width: $base_icon_size * 2.5;
+    height: $base_icon_size * 2.5; // 40px;
   }
 
   &.user-avatar {
-    border: 2px solid $osd_fg_color;
+    border: none;
+    box-shadow: inset 0 0 0 1px transparentize($light_alt_fg_color, 0.9);
   }
 }
 
diff --git a/src/sass/gnome-shell/common/_notifications.scss b/src/sass/gnome-shell/common/_notifications.scss
index 1e7d5fc..963df41 100644
--- a/src/sass/gnome-shell/common/_notifications.scss
+++ b/src/sass/gnome-shell/common/_notifications.scss
@@ -5,7 +5,7 @@
   font-size: 1em;
   width: 34em;
   min-height: $menuitem_size * 2;
-  margin: $base_padding;
+  margin: 12px 6px 8px;
   border-radius: $wm_radius;
   color: $fg_color;
   background-color: $menu_bg;
diff --git a/src/sass/gnome-shell/widgets-44-0/_quick-settings.scss b/src/sass/gnome-shell/widgets-44-0/_quick-settings.scss
index be6a0bb..65d36da 100644
--- a/src/sass/gnome-shell/widgets-44-0/_quick-settings.scss
+++ b/src/sass/gnome-shell/widgets-44-0/_quick-settings.scss
@@ -1,6 +1,7 @@
 .quick-settings {
   padding: $base_padding * 3;
   border-radius: $modal_radius * 2.25;
+  margin-top: $base_padding * 2 !important;
 
   .icon-button, .button {
     padding: $base_padding * 1.75;