diff --git a/src/sass/gnome-shell/common/_message-list.scss b/src/sass/gnome-shell/common/_message-list.scss
index cb43412..7b2d190 100644
--- a/src/sass/gnome-shell/common/_message-list.scss
+++ b/src/sass/gnome-shell/common/_message-list.scss
@@ -92,7 +92,7 @@
     padding: 0;
     height: 24px;
     width: 24px;
-    border-radius: 100px;
+    border-radius: $circular_radius;
 
     &:hover, &:active { color: $fg_color; }
     &:hover, &:focus { background-color: $divider_color; }
@@ -113,7 +113,7 @@
 .message-media-control {
   margin: 16px 4px;
   padding: 8px;
-  border-radius: 100px;
+  border-radius: $circular_radius;
   color: $alt_fg_color;
   &:hover, &:focus { color: $fg_color; background-color: $divider_color; }
   &:active { color: $fg_color; background-color: $track_color; }
@@ -126,8 +126,8 @@
 // album-art
 .media-message-cover-icon {
   icon-size: 32px !important;
-  margin: 0 0px 0 4px !important;
-  &:rtl { margin: 0 4px 0 0px !important; }
+  margin: 0 0 0 4px !important;
+  &:rtl { margin: 0 4px 0 0 !important; }
   &.fallback {
     icon-size: 16px !important;
     padding: 8px;
diff --git a/src/sass/gtk/_common-3.0.scss b/src/sass/gtk/_common-3.0.scss
index f5a380a..6581bca 100644
--- a/src/sass/gtk/_common-3.0.scss
+++ b/src/sass/gtk/_common-3.0.scss
@@ -2183,7 +2183,7 @@ menu,
   padding: $container_padding;
   border-radius: $mn_radius;
   background-color: opacify($menu_bg, 1);
-  border: 1px solid $solid_borders_color;
+  border: none;
   color: $fg_color;
 
   .csd & {
diff --git a/src/sass/gtk/apps/_misc.scss b/src/sass/gtk/apps/_misc.scss
index 2626892..3b7f6cc 100644
--- a/src/sass/gtk/apps/_misc.scss
+++ b/src/sass/gtk/apps/_misc.scss
@@ -633,3 +633,13 @@ menubar.-vala-panel-background {
     }
   }
 }
+
+//
+// Drawing
+//
+
+window.background.csd {
+  > box.vertical > box.horizontal > notebook.frame {
+    border: none;
+  }
+}