diff --git a/theme/parts/buttons.css b/theme/parts/buttons.css
index 9883264..91bf30e 100644
--- a/theme/parts/buttons.css
+++ b/theme/parts/buttons.css
@@ -30,7 +30,6 @@ button.close,
 .menulist-label-box,
 .expander-down, .expander-up,
 .notification-button,
-.protections-popup-footer-button,
 #identity-popup-security-expander,
 #protections-popup-info-button,
 #PanelUI-panic-view-button,
@@ -40,7 +39,6 @@ button.close,
 .dialog-button-box button,
 .searchbar-engine-one-off-item,
 .permission-popup-permission-remove-button,
-#protections-popup-trackers-blocked-counter-box,
 .button.connect-device,
 #item-choose button {
 	-moz-appearance: none !important;
@@ -66,7 +64,6 @@ button.close,
 .close-icon:not(.tab-close-button),
 button.close,
 #protections-popup-info-button,
-#protections-popup-trackers-blocked-counter-box,
 .permission-popup-permission-remove-button,
 #item-choose button {
 	background: transparent !important;
@@ -94,14 +91,12 @@ menulist,
 #tracking-protection-preferences-button:not(#hack),
 .findbar-container toolbarbutton.findbar-button,
 .notification-button,
-.protections-popup-footer-button,
 #PanelUI-panic-view-button,
 .tracking-protection-button,
 .dialog-button,
 .autocomplete-richlistitem[type="loginsFooter"],
 .dialog-button-box button,
 .toolbaritem-combined-buttons:is(:not([cui-areatype="toolbar"]), [overflowedItem="true"]) > #appMenu-fxa-label2:not(#hack),
-#protections-popup-trackers-blocked-counter-box,
 .button.connect-device,
 #item-choose button {
 	padding: 2px 16px !important;
@@ -115,13 +110,11 @@ menulist,
 #tracking-protection-preferences-button:not(#hack),
 .findbar-container toolbarbutton.findbar-button,
 .notification-button,
-.protections-popup-footer-button,
 #PanelUI-panic-view-button,
 .tracking-protection-button,
 .dialog-button,
 .autocomplete-richlistitem[type="loginsFooter"],
 .dialog-button-box button,
-#protections-popup-trackers-blocked-counter-box,
 .button.connect-device,
 #item-choose button {
 	text-align: center !important;
@@ -168,7 +161,6 @@ menulist:hover,
 menulist:hover .menulist-label-box,
 .expander-down:hover, .expander-up:hover,
 .notification-button:hover,
-.protections-popup-footer-button:hover,
 #identity-popup-security-expander:hover,
 .tracking-protection-button:hover,
 .dialog-button:hover,
@@ -185,7 +177,6 @@ menulist:hover .menulist-label-box,
 .close-icon:not(.tab-close-button):hover,
 button.close:hover,
 #protections-popup-info-button:hover,
-#protections-popup-trackers-blocked-counter-box:hover,
 .permission-popup-permission-remove-button:hover,
 #item-choose button:hover {
 	outline: 0 !important;
@@ -210,7 +201,6 @@ menulist[open],
 menulist[open] .menulist-label-box,
 .expander-down:active, .expander-up:active,
 .notification-button:active,
-.protections-popup-footer-button:not(#hack):active,
 #identity-popup-security-expander:active,
 .tracking-protection-button:active,
 .dialog-button:active,
@@ -228,7 +218,6 @@ menulist[open] .menulist-label-box,
 button.close:active,
 #protections-popup-info-button:not(#hack):active,
 #protections-popup-info-button:not(#hack)[checked],
-#protections-popup-trackers-blocked-counter-box:active,
 .permission-popup-permission-remove-button:active,
 #item-choose button:active {
 	background: var(--gnome-button-flat-active-background) !important;
diff --git a/theme/parts/popups-contents.css b/theme/parts/popups-contents.css
index ffecc54..931d721 100644
--- a/theme/parts/popups-contents.css
+++ b/theme/parts/popups-contents.css
@@ -144,29 +144,11 @@
 	color: white !important;
 }
 
-/* Url popups */
-#identity-popup-mainView-panel-header,
-#permission-popup-mainView-panel-header,
-#protections-popup-mainView-panel-header,
-#permission-popup-mainView-panel-header-span,
-#identity-popup-mainView-panel-header-span,
-#protections-popup-mainView-panel-header-span,
-#protections-popup-toast-panel-tp-on-desc,
-#protections-popup-toast-panel-tp-off-desc,
-#protections-popup .panel-header > h1 > span,
-#permission-popup .panel-header > h1 > span,
-#identity-popup .panel-header > h1 > span {
-	min-width: auto !important;
-	max-width: initial !important;
-}
-
 /* URLbar popups */
 #identity-popup-mainView,
 #permission-popup-mainView,
 #protections-popup-mainView,
-#identity-popup-mainView-panel-header,
-#permission-popup-mainView-panel-header,
-#protections-popup-mainView-panel-header {
+#identity-popup-mainView-panel-header {
   min-width: calc(var(--popup-width) + (var(--gnome-menu-padding) * 2)) !important;
   min-width: calc(var(--popup-width) + (var(--gnome-menu-padding) * 2)) !important;
 }
@@ -294,18 +276,20 @@
 	background: var(--gnome-menu-background);
 	border: 1px solid var(--gnome-button-border-color) !important;
 	border-radius: 9px;
-	padding: 12px !important;
+	padding: 12px 16px !important;
 	margin: 0 !important;
 }
+
 #protections-popup[hasException] #protections-popup-tp-switch-section {
 	background: var(--gnome-menu-background) !important;
 }
 .protections-popup-tp-switch-label-box label {
+	margin-right: 12px !important;
 	font-weight: normal !important;
 }
 
 #protections-popup-no-trackers-found-description {
-	margin: 12px 0 !important;
+	margin: 12px 12px 0 !important;
 	text-align: left !important;
 }
 
@@ -338,19 +322,14 @@
 }
 #protections-popup-show-report-stack {
 	width: 100% !important;
-	display: flex;
-	justify-content: space-between;
-	align-items: center;
-	margin-top: 10px;
 }
-.protections-popup-footer-button {
+#protections-popup-show-report-button {
+	height: 32px !important;
+}
+#protections-popup-trackers-blocked-counter-box,
+#protections-popup-footer-protection-type-label  {
 	margin: 0 !important;
-}
-#protections-popup-footer-protection-type-label {
-	margin-left: 8px !important;
-}
-#protections-popup-trackers-blocked-counter-box {
-	margin-inline-end: 0 !important;
+	margin-inline: 0 !important;
 }
 .protections-popup-description {
     border-bottom: 0 !important;
diff --git a/theme/parts/popups.css b/theme/parts/popups.css
index b834986..eba924f 100644
--- a/theme/parts/popups.css
+++ b/theme/parts/popups.css
@@ -77,13 +77,18 @@ panel  {
 .subviewbutton.panel-subview-footer-button {
 	margin: var(--gnome-menu-padding) !important;
 }
+.subviewbutton.panel-subview-footer-button:not(:only-child) {
+	margin: 0 var(--gnome-menu-padding) !important;
+}
+.subviewbutton.panel-subview-footer-button:not(:only-child):last-child {
+	margin-bottom: var(--gnome-menu-padding) !important;
+}
 #identity-popup-security-button {
 	margin: 0 var(--gnome-menu-padding) !important;
 }
 
 /* No menu */
 #notification-popup,
-#protections-popup,
 #permission-popup,
 #editBookmarkPanel {
 	--gnome-menu-padding: 12px !important;
@@ -141,6 +146,7 @@ panel  {
 menuitem, menupopup menu,
 .subviewbutton:not(#appMenu-fxa-label2),
 .toolbarbutton-1,
+.protections-popup-footer-button,
 .protections-popup-category,
 .identity-popup-content-blocking-category,
 #PlacesToolbar .bookmark-item {
@@ -153,6 +159,7 @@ menuitem, menupopup menu,
 	min-height: 32px !important;
 }
 .subviewbutton,
+.protections-popup-footer-button,
 .protections-popup-category,
 .identity-popup-content-blocking-category,
 #PlacesToolbar menupopup[placespopup="true"] .bookmark-item,
@@ -182,6 +189,8 @@ menupopup menu:not([disabled]):is(:hover, [open], [_moz-menuactive]),
 .subviewbutton:not([disabled],
 #appMenu-zoom-controls2, #appMenu-fxa-label2):hover,
 .toolbarbutton-1:not([disabled]):hover,
+.protections-popup-footer-button:not([disabled]):hover,
+#protections-popup-show-report-stack:hover .protections-popup-footer-button,
 .protections-popup-category:not([disabled]):hover,
 .identity-popup-content-blocking-category:not([disabled]):hover,
 #PlacesToolbar .bookmark-item:is(:hover, [open], [_moz-menuactive]) {
@@ -217,12 +226,6 @@ toolbarseparator, menuseparator {
 	border-color: var(--gnome-menu-separator-color) !important;
 }
 
-.panel-subview-body + toolbarseparator:not([orient="vertical"]),
-#identity-popup-clear-sitedata-footer toolbarseparator,
-#identity-popup-more-info-footer toolbarseparator {
-	margin: 0 !important;
-}
-
 #PlacesToolbar menupopup[placespopup="true"] menuseparator {
 	border-top: 1px solid var(--gnome-menu-separator-color) !important;
 	padding: 0 !important;
@@ -238,3 +241,15 @@ toolbarseparator:not([orient="vertical"]), menupopup menuseparator {
 toolbarseparator[orient="vertical"] {
 	margin: 0 6px !important;
 }
+
+.panel-subview-body + toolbarseparator:not([orient="vertical"]) {
+	margin: 0 0 6px !important;
+}
+panelview > toolbarseparator:not([orient="vertical"]),
+#identity-popup-clear-sitedata-footer toolbarseparator:not([orient="vertical"]),
+#identity-popup-more-info-footer toolbarseparator:not([orient="vertical"]){
+	margin: 6px !important;
+}
+#identity-popup-clear-sitedata-footer toolbarseparator:not([orient="vertical"]) {
+	margin-top: 0 !important;
+}