diff --git a/theme/gnome-shell/.css/messages.css b/theme/gnome-shell/.css/messages.css
index 7dda031..a2caab7 100644
--- a/theme/gnome-shell/.css/messages.css
+++ b/theme/gnome-shell/.css/messages.css
@@ -41,6 +41,7 @@
 .message-list .message, .popup-menu-content .message {
 	background-color: SECTION-COLOR;
 	box-shadow: inset 0 0 0 1px BORDER-SHADOW;
+	border-radius: 15px;
 	transition-duration: 100ms;
 }
 .message-list .message:hover {
@@ -75,7 +76,6 @@
 .message-expand-button {
 	border-radius: 99px;
 	padding: 5px;
-	margin: 0px;
 	color: TEXT-PRIMARY-COLOR;
 	background-color: ACCENT-DISABLED-COLOR;
 	box-shadow: inset 0 0 0 1px BORDER-SHADOW;
diff --git a/theme/gnome-shell/.css/osd.css b/theme/gnome-shell/.css/osd.css
index 7485f07..2f13c9b 100644
--- a/theme/gnome-shell/.css/osd.css
+++ b/theme/gnome-shell/.css/osd.css
@@ -96,7 +96,8 @@
 
 
 /* button in modals */
-.modal-dialog-linked-button,
+.modal-dialog-linked-button, /* 46 */
+.modal-dialog-button-box .modal-dialog-button, /* 47+ */
 .notification-button {
 	box-shadow: inset 0 0 0 1px BORDER-SHADOW;
 	background-color: ACCENT-DISABLED-COLOR;
@@ -104,6 +105,10 @@
 	animation-duration: 100ms;
 }
 
+.modal-dialog-button-box .modal-dialog-button:focus {
+	box-shadow: inset 0 0 0 2px ACCENT-SECONDARY-COLOR !important;
+}
+
 .modal-dialog-linked-button {
 	padding: 10px 0;
 	border-radius: 12px;