diff --git a/src/browser/base/content/browser-siteIdentity-js.patch b/src/browser/base/content/browser-siteIdentity-js.patch
new file mode 100644
index 000000000..82ac5ce09
--- /dev/null
+++ b/src/browser/base/content/browser-siteIdentity-js.patch
@@ -0,0 +1,17 @@
+diff --git a/browser/base/content/browser-siteIdentity.js b/browser/base/content/browser-siteIdentity.js
+index a2a5f6ff71b9a6587e2a033aee39385abd319645..789980baee419249c5bb206d6117abe9994631bf 100644
+--- a/browser/base/content/browser-siteIdentity.js
++++ b/browser/base/content/browser-siteIdentity.js
+@@ -1143,6 +1143,12 @@ var gIdentityHandler = {
+       }
+     }
+ 
++    if (connection == "chrome" || connection == "extension" || connection == "file") {
++      document.getElementById("identity-popup-mainView-panel-header").setAttribute("hidden", "true");
++    } else {
++      document.getElementById("identity-popup-mainView-panel-header").removeAttribute("hidden");
++    }
++
+     // Push the appropriate strings out to the UI.
+     document.l10n.setAttributes(
+       this._identityPopupMainViewHeaderLabel,
diff --git a/src/browser/components/controlcenter/content/identityPanel-inc-xhtml.patch b/src/browser/components/controlcenter/content/identityPanel-inc-xhtml.patch
new file mode 100644
index 000000000..34df68537
--- /dev/null
+++ b/src/browser/components/controlcenter/content/identityPanel-inc-xhtml.patch
@@ -0,0 +1,13 @@
+diff --git a/browser/components/controlcenter/content/identityPanel.inc.xhtml b/browser/components/controlcenter/content/identityPanel.inc.xhtml
+index 0344fcb566e8e0bedd92b0d45e42aea38de5c329..0d5296700590dd0c8a90929976b8cbc5370e7b47 100644
+--- a/browser/components/controlcenter/content/identityPanel.inc.xhtml
++++ b/browser/components/controlcenter/content/identityPanel.inc.xhtml
+@@ -30,7 +30,7 @@
+       <toolbarseparator/>
+       <vbox class="panel-subview-body">
+         <toolbarbutton id="identity-popup-security-button"
+-                       class="identity-popup-security-connection subviewbutton subviewbutton-iconic"
++                       class="identity-popup-security-connection subviewbutton"
+                        oncommand="gIdentityHandler.showSecuritySubView();">
+           <image class="identity-popup-security-connection-icon toolbarbutton-icon"></image>
+           <hbox class="toolbarbutton-text" flex="1">
diff --git a/src/browser/themes/shared/controlcenter/panel-css.patch b/src/browser/themes/shared/controlcenter/panel-css.patch
new file mode 100644
index 000000000..3347b99a3
--- /dev/null
+++ b/src/browser/themes/shared/controlcenter/panel-css.patch
@@ -0,0 +1,18 @@
+diff --git a/browser/themes/shared/controlcenter/panel.css b/browser/themes/shared/controlcenter/panel.css
+index d7685cdc694267f21258dcb958fda377c56866c8..3b26da23dba9809aaec5b5391a1938a0455515d7 100644
+--- a/browser/themes/shared/controlcenter/panel.css
++++ b/browser/themes/shared/controlcenter/panel.css
+@@ -10,11 +10,11 @@
+ #identity-popup,
+ #permission-popup,
+ #protections-popup {
+-  --popup-width: 30.81em;
++  --popup-width: 28.81em;
+   /* Set default fill for icons in the identity popup.
+      Individual icons can override this. */
+   fill: currentColor;
+-  --horizontal-padding: calc(var(--arrowpanel-menuitem-padding-inline) * 2);
++  --horizontal-padding: 0;
+   --vertical-section-padding: 0.9em;
+   --height-offset: 0px;
+   font: menu;
diff --git a/src/browser/themes/shared/zen-browser-shared.css b/src/browser/themes/shared/zen-browser-shared.css
index f2227a622..dce3f00ac 100644
--- a/src/browser/themes/shared/zen-browser-shared.css
+++ b/src/browser/themes/shared/zen-browser-shared.css
@@ -173,10 +173,8 @@ button.popup-notification-dropmarker {
 #navigator-toolbox toolbar#TabsToolbar {
   margin: var(--zen-appcontent-separator-from-window);
   background: var(--sidebar-background-color);
-  box-shadow: var(--zen-sidebar-box-shadow) !important;
   overflow: hidden;
   transition: .2s;
-  border: 1px solid var(--zen-dialog-border-color);
   border-radius: 15px !important;
   flex-direction: column !important;
   padding: 5px 0;
@@ -353,3 +351,19 @@ toolbarbutton#scrollbutton-up {
 menuseparator {
   --panel-separator-color: var(--zen-colors-secondary) !important;
 }
+
+/** Specific dialogs override */
+
+#identity-popup-multiView toolbarseparator {
+  display: none;
+}
+
+#identity-popup-more-info-footer toolbarseparator {
+  display: block;
+}
+
+panelmultiview {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+}
diff --git a/src/browser/themes/shared/zen-sidebar.css b/src/browser/themes/shared/zen-sidebar.css
index aaa29e1b6..7e2848678 100644
--- a/src/browser/themes/shared/zen-sidebar.css
+++ b/src/browser/themes/shared/zen-sidebar.css
@@ -7,10 +7,8 @@
   --zen-sidebar-box-border-radius: var(--zen-panel-radius);
   margin: var(--zen-appcontent-separator-from-window) !important;
   border-radius: var(--zen-sidebar-box-border-radius) !important;
-  box-shadow: none !important;
   overflow: hidden;
   transition: .2s;
-  border: 1px solid var(--zen-dialog-border-color);
   margin-left: 0 !important;
 }
 
diff --git a/src/toolkit/content/zen-xul.css b/src/toolkit/content/zen-xul.css
index 403851a54..6c36f6de2 100644
--- a/src/toolkit/content/zen-xul.css
+++ b/src/toolkit/content/zen-xul.css
@@ -23,11 +23,17 @@ html#main-window > body {
 :not([inDOMFullscreen="true"]) #appcontent {
   border-radius: var(--zen-panel-radius);
   overflow: hidden;
-  box-shadow: 0 4px 6px -1px rgb(0 0 0 / 0.1), 0 2px 4px -2px rgb(0 0 0 / 0.1);
-  border: 1px solid var(--zen-dialog-border-color);
   margin: var(--zen-appcontent-separator-from-window);
 }
 
+:not([inDOMFullscreen="true"]) #appcontent,
+#sidebar-box,
+#navigator-toolbox #TabsToolbar {
+  /** Sidebar is already hidden in full screen mode */
+  box-shadow: rgba(0, 0, 0, 0.1) 0px 4px 12px;
+  border: none;
+}
+
 
 panel[type="arrow"][animate][animate="open"] {
   animation: zen-jello-animation 0.2s ease-in-out;
diff --git a/src/toolkit/themes/shared/zen-popup.css b/src/toolkit/themes/shared/zen-popup.css
index 14bdab368..0712477a8 100644
--- a/src/toolkit/themes/shared/zen-popup.css
+++ b/src/toolkit/themes/shared/zen-popup.css
@@ -231,3 +231,11 @@ menupopup,
 panel {
   box-shadow: none;
 }
+
+toolbarbutton:not(#appMenu-fxa-label2, .subviewbutton-iconic),
+#PanelUI-zen-profiles menuitem {
+  /** ADD HERE ALL TYPES OF BUTTONS THAT WANT TO LOOK CHROME LIKE!!! */
+  margin-left: 0 !important;
+  margin: 2.5px 0 !important;
+  border-radius: 0 !important;
+}