diff --git a/theme/gnome-shell/.css/controls.css b/theme/gnome-shell/.css/controls.css
index 66158e6..f6d1357 100644
--- a/theme/gnome-shell/.css/controls.css
+++ b/theme/gnome-shell/.css/controls.css
@@ -104,7 +104,7 @@
 /* clear button */
 .message-list-clear-button {
 	padding: 0 20px;
-	border-radius: 10px;
+	border-radius: 9px;
 }
 
 .message-list-clear-button:insensitive {
diff --git a/theme/gnome-shell/.css/datemenu.css b/theme/gnome-shell/.css/datemenu.css
index da84fb6..6003946 100644
--- a/theme/gnome-shell/.css/datemenu.css
+++ b/theme/gnome-shell/.css/datemenu.css
@@ -6,17 +6,13 @@
 }
 
 /* Calendar menu side column */
-.datemenu-calendar-column {
-	spacing: 5px;
-}
+.datemenu-calendar-column { spacing: 0px; }
 
 /* let's bring back issue #1 */
-.datemenu-calendar-column:ltr { padding-left: 0; }
-.datemenu-calendar-column:rtl {	padding-right: 0; }
+.datemenu-calendar-column:ltr { margin-left: 0; }
+.datemenu-calendar-column:rtl {	margin-right: 0; }
 
-.datemenu-calendar-column .datemenu-displays-box {
-	spacing: 5px;
-}
+.datemenu-calendar-column .datemenu-displays-box { spacing: 0px; }
 
 
 /* today header button */
diff --git a/theme/gnome-shell/.css/messages.css b/theme/gnome-shell/.css/messages.css
index a2caab7..4465286 100644
--- a/theme/gnome-shell/.css/messages.css
+++ b/theme/gnome-shell/.css/messages.css
@@ -27,7 +27,6 @@
 	border-radius: 18px;
 }
 
-
 /* Message OSD */
 .notification-banner {
 	background-color: BACKGROUND-COLOR;
@@ -36,12 +35,15 @@
 	box-shadow: 0 0 15px 0 rgba(0, 0, 0, 0.07);
 }
 
+/* Box layout for messages. I know looks weird but i can't find a better way to do it */
+.message-list > StBoxLayout > StScrollView > StViewport { spacing: 8px; } /* gap between player and messages box */
+.message-list > StBoxLayout > StScrollView > StViewport > StBoxLayout > StBoxLayout { spacing: 8px; } /* gap between messages */
 
 /* messages in menus */
 .message-list .message, .popup-menu-content .message {
 	background-color: SECTION-COLOR;
 	box-shadow: inset 0 0 0 1px BORDER-SHADOW;
-	border-radius: 15px;
+	border-radius: 13px;
 	transition-duration: 100ms;
 }
 .message-list .message:hover {
@@ -92,10 +94,19 @@
 	color: TEXT-SECONDARY-COLOR;
 }
 
+/* message buttons */
+.message-list .message-action-bin { padding: 2px; }
+.message-action-bin StBoxLayout { spacing: 0; }
+
+.message-list .message-action-bin * {
+	border-radius: 9px;
+	font-size: 14px;
+}
+
 
 /* Media Controls */
 .message-media-control {
-	border-radius: 12px;
+	border-radius: 9px;
 	/* currently disabled because of 46 */
 	/* padding: 0 14px; */
 	/* margin: 20px 2px; */