diff --git a/theme/parts/buttons-fixes.css b/theme/parts/buttons-fixes.css
index b3cb15d..fab7e33 100644
--- a/theme/parts/buttons-fixes.css
+++ b/theme/parts/buttons-fixes.css
@@ -196,3 +196,8 @@ menulist {
     margin-inline-end: 0 !important;
 	margin-block: 0 !important;
 }
+
+/* Close button */
+.close-icon:not(.tab-close-button) .toolbarbutton-icon {
+	outline:  0 !important;
+}
\ No newline at end of file
diff --git a/theme/parts/buttons.css b/theme/parts/buttons.css
index 0ddcbc4..35ec2a0 100644
--- a/theme/parts/buttons.css
+++ b/theme/parts/buttons.css
@@ -57,7 +57,9 @@ tabmodalprompt[role="dialog"] button[class*='tabmodalprompt-button'] {
 
 /* Buttons with margins */
 #nav-bar toolbarbutton:not(#urlbar-zoom-button):not(.subviewbutton),
-.notification-button {
+.notification-button,
+.subviewbutton.panel-subview-footer:not(:only-of-type),
+.panel-footer button:not(:only-of-type) {
 	margin: 0 3px !important;
 }
 #TabsToolbar .toolbarbutton-1 {
@@ -245,8 +247,6 @@ tabmodalprompt[role="dialog"] button[class*='tabmodalprompt-button']:active {
 /* Combined buttons */
 #nav-bar .toolbaritem-combined-buttons toolbarbutton:not(:last-of-type):not(#hack),
 #nav-bar #back-button:not(#hack),
-.subviewbutton.panel-subview-footer:not(:only-of-type):not(:last-of-type),
-.panel-footer button:not(:only-of-type):not(:last-of-type),
 #appMenu-popup .toolbaritem-combined-buttons toolbarbutton:not(:last-of-type):not(#appMenu-zoomEnlarge-button),
 #context-navigation menuitem:not(:last-of-type),
 .findbar-container toolbarbutton.findbar-find-previous,
@@ -259,8 +259,6 @@ tabmodalprompt[role="dialog"] button[class*='tabmodalprompt-button']:active {
 
 #nav-bar .toolbaritem-combined-buttons toolbarbutton:not(:first-of-type):not(#hack),
 #nav-bar #forward-button:not(#hack),
-.subviewbutton.panel-subview-footer:not(:only-of-type):not(:first-of-type),
-.panel-footer button:not(:only-of-type):not(:first-of-type),
 #appMenu-popup .toolbaritem-combined-buttons toolbarbutton:not(:first-of-type):not(#appMenu-fullscreen-button),
 #context-navigation menuitem:not(:first-of-type),
 .findbar-container toolbarbutton.findbar-find-previous,
diff --git a/theme/parts/popups-contents.css b/theme/parts/popups-contents.css
index 4042541..bd0a533 100644
--- a/theme/parts/popups-contents.css
+++ b/theme/parts/popups-contents.css
@@ -368,6 +368,11 @@
     width: auto !important;
 }
 
+/* Notification popups */
+.popup-notification-learnmore-link {
+	margin-top: 40px !important;
+}
+
 /* Extensions sometimes assume a white background */
 .webextension-popup-browser {
   background-color: #fff !important;