diff --git a/theme/parts/buttons.css b/theme/parts/buttons.css
index 91bf30e..442fddd 100644
--- a/theme/parts/buttons.css
+++ b/theme/parts/buttons.css
@@ -17,7 +17,6 @@ menulist,
 .panel-footer button,
 #downloadsHistory,
 #downloadsPanel-mainView .download-state .downloadButton,
-#overflowMenu-customize-button,
 #appMenu-popup .panel-banner-item,
 #appMenu-popup .toolbaritem-combined-buttons toolbarbutton:not(#appMenu-fxa-label),
 #context-navigation menuitem,
@@ -85,7 +84,6 @@ menulist,
 .subviewbutton.panel-subview-footer,
 .panel-footer button,
 #downloadsHistory,
-#overflowMenu-customize-button,
 #appMenu-popup .panel-banner-item,
 #appMenu-popup #appMenu-zoomReset-button2:not(#hack),
 #tracking-protection-preferences-button:not(#hack),
@@ -104,7 +102,6 @@ menulist,
 .subviewbutton.panel-subview-footer label,
 .panel-footer button,
 #downloadsHistory,
-#overflowMenu-customize-button,
 #appMenu-popup .panel-banner-item,
 #appMenu-popup #appMenu-zoomReset-button2:not(#hack),
 #tracking-protection-preferences-button:not(#hack),
@@ -149,7 +146,6 @@ menulist:hover,
 .panel-footer button:hover,
 #downloadsHistory:hover,
 #downloadsPanel-mainView .download-state .downloadButton:hover,
-#overflowMenu-customize-button:hover,
 #appMenu-popup .panel-banner-item:hover,
 #appMenu-popup .toolbaritem-combined-buttons toolbarbutton:not(#appMenu-fxa-label):not([disabled]):hover,
 #context-navigation menuitem:not([disabled]):hover,
@@ -189,7 +185,6 @@ menulist[open],
 .panel-footer button:active,
 #downloadsHistory:active,
 #downloadsPanel-mainView .download-state .downloadButton:active,
-#overflowMenu-customize-button:active,
 #appMenu-popup .panel-banner-item:active,
 #appMenu-popup .toolbaritem-combined-buttons toolbarbutton:not([disabled]):not(#appMenu-fxa-label):active,
 #context-navigation menuitem:active:not([disabled]),
diff --git a/theme/parts/popups-contents.css b/theme/parts/popups-contents.css
index 931d721..5b8ce1f 100644
--- a/theme/parts/popups-contents.css
+++ b/theme/parts/popups-contents.css
@@ -149,7 +149,7 @@
 #permission-popup-mainView,
 #protections-popup-mainView,
 #identity-popup-mainView-panel-header {
-  min-width: calc(var(--popup-width) + (var(--gnome-menu-padding) * 2)) !important;
+  max-width: calc(var(--popup-width) + (var(--gnome-menu-padding) * 2)) !important;
   min-width: calc(var(--popup-width) + (var(--gnome-menu-padding) * 2)) !important;
 }
 
@@ -183,6 +183,10 @@
 #permission-popup-permissions-content {
 	padding: 0 !important;
 }
+#permission-popup-mainView {
+  min-width: unset !important;
+  max-width: unset !important;
+}
 
 .permission-popup-permission-item:first-child, #permission-popup-storage-access-permission-list-header {
     margin-top: 0 !important;
diff --git a/theme/parts/popups.css b/theme/parts/popups.css
index eba924f..a26a7e1 100644
--- a/theme/parts/popups.css
+++ b/theme/parts/popups.css
@@ -37,6 +37,7 @@ panel[type=arrow] {
 /* Style popovers */
 panel:not([remote]) {
 	--arrowpanel-background: var(--gnome-menu-background) !important;
+	--panel-item-hover-bgcolor: var(--gnome-menu-button-hover-background) !important;
 }
 panel  {
 	--arrowpanel-padding: 0 !important;
@@ -61,18 +62,21 @@ panel  {
 	padding: 0 var(--gnome-menu-padding) var(--gnome-menu-padding) !important;
 }
 :is(
-    .panel-header, .panel-footer,
-    .panel-subview-body,
-    .protections-popup-section,
-    #protections-popup-mainView-panel-header-section,
-    .permission-popup-section,
-    .identity-popup-section,
-		.popup-notification-header-container,
-		.popup-notification-body-container,
-		.popup-notification-footer-container
+	.panel-header, .panel-footer,
+	.panel-subview-body,
+	.protections-popup-section,
+	#protections-popup-mainView-panel-header-section,
+	.permission-popup-section,
+	.identity-popup-section,
+	.popup-notification-header-container,
+	.popup-notification-body-container,
+	.popup-notification-footer-container
 ):first-child:not(:empty) {
 	padding-top: var(--gnome-menu-padding) !important;
 }
+.panel-subview-body > .panel-subview-body {
+	padding: 0 !important;
+}
 /* Padding with margign */
 .subviewbutton.panel-subview-footer-button {
 	margin: var(--gnome-menu-padding) !important;
@@ -186,9 +190,7 @@ menuitem, menupopup menu,
 /* Menu buttons hover */
 menuitem:not([disabled]):is(:hover, [open], [_moz-menuactive]),
 menupopup menu:not([disabled]):is(:hover, [open], [_moz-menuactive]),
-.subviewbutton:not([disabled],
-#appMenu-zoom-controls2, #appMenu-fxa-label2):hover,
-.toolbarbutton-1:not([disabled]):hover,
+.subviewbutton:not([disabled], #appMenu-zoom-controls2, #appMenu-fxa-label2):hover,
 .protections-popup-footer-button:not([disabled]):hover,
 #protections-popup-show-report-stack:hover .protections-popup-footer-button,
 .protections-popup-category:not([disabled]):hover,
@@ -207,6 +209,7 @@ menupopup menu:not([disabled]):is(:hover, [open], [_moz-menuactive]),
 
 /* Menu buttons back */
 .subviewbutton-back {
+	opacity: 1 !important;
 	width: 100%;
 	-moz-box-align: center !important;
 	-moz-box-pack: start !important;
@@ -221,6 +224,14 @@ menupopup menu:not([disabled]):is(:hover, [open], [_moz-menuactive]),
 	width: 100%;
 }
 
+/* Menu headers */
+.subview-subheader {
+	font: menu !important;
+	font-weight: bold !important;
+	padding-block: 0 !important;
+	margin: 0 4px !important;
+}
+
 /* Style popover separators */
 toolbarseparator, menuseparator {
 	border-color: var(--gnome-menu-separator-color) !important;