diff --git a/theme/parts/buttons.css b/theme/parts/buttons.css
index 8e361e0..15cbe88 100644
--- a/theme/parts/buttons.css
+++ b/theme/parts/buttons.css
@@ -197,7 +197,7 @@ menulist[open] .menulist-label-box,
 .findbar-container toolbarbutton:-moz-window-inactive,
 #sidebar-switcher-target:-moz-window-inactive,
 #viewButton:-moz-window-inactive,
-.notification-button:-moz-window-inactive {	
+.notification-button:-moz-window-inactive {
 	background: var(--gnome-inactive-button-background) !important;
 	box-shadow: var(--gnome-inactive-button-box-shadow) !important;
 	border-color: var(--gnome-inactive-button-border-color) !important;
diff --git a/theme/parts/csd.css b/theme/parts/csd.css
index 98e3540..2f7b0d8 100644
--- a/theme/parts/csd.css
+++ b/theme/parts/csd.css
@@ -70,7 +70,7 @@
 }
 :root[tabsintitlebar] #titlebar:-moz-window-inactive .titlebar-button .toolbarbutton-icon,
 :root[tabsintitlebar][inFullscreen] #window-controls:-moz-window-inactive toolbarbutton .toolbarbutton-icon {
-	opacity: .5 !important;
+	opacity: .3 !important;
 }
 :root[tabsintitlebar] #titlebar:not(:-moz-window-inactive) .titlebar-button:not([disabled]):hover,
 :root[tabsintitlebar][inFullscreen] #window-controls:not(:-moz-window-inactive) toolbarbutton:not([disabled]):hover {
diff --git a/theme/parts/entries.css b/theme/parts/entries.css
index f2982e4..f4eb716 100644
--- a/theme/parts/entries.css
+++ b/theme/parts/entries.css
@@ -27,7 +27,6 @@
 }
 
 /* Entries focused */
-#urlbar.megabar[breakout][breakout-extend],
 #urlbar:not(.megabar)[focused],
 #searchbar:focus-within,
 #search-box[focused], 
diff --git a/theme/parts/headerbar-private-window.css b/theme/parts/headerbar-private-window.css
index 9942c8e..6fafbe2 100644
--- a/theme/parts/headerbar-private-window.css
+++ b/theme/parts/headerbar-private-window.css
@@ -2,15 +2,15 @@
 
 @namespace xul url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
-/*  */
+/* Add private window headerbar indicator */
 :root[privatebrowsingmode="temporary"] #nav-bar toolbarspring:first-of-type:before {
 	background: url("../icons/user-not-tracked.svg") no-repeat;
-	background-size: contain;
+	background-size: 64px 64px;
 	content: "";
 	display: block;	
 	position: absolute;
 	width: 64px;
-	height: 64px;
+	height: 46px;
 	top: 0;
 	opacity: 0.3;
 	transform: translate(15px, 0);	
@@ -20,11 +20,8 @@
 		filter: invert(100%);
 	}
 }
-:root[privatebrowsingmode="temporary"] #nav-bar {
-	overflow: hidden;
-}
 
-/* */
+/* Hide tabsbar default private browsing indicator */
 #TabsToolbar .private-browsing-indicator {
 	display: none !important;
 }
diff --git a/theme/parts/headerbar-urlbar.css b/theme/parts/headerbar-urlbar.css
index 016ca19..8716da1 100644
--- a/theme/parts/headerbar-urlbar.css
+++ b/theme/parts/headerbar-urlbar.css
@@ -8,16 +8,13 @@
 }
 
 /* Megabar reset  */
+
 #urlbar.megabar {
 	border: 0 !important;
 	box-shadow: none !important;
 	border-radius: 0 !important;
 	background: transparent !important;
 }
-#urlbar.megabar, #urlbar.megabar > #urlbar-input-container, #urlbar.megabar > .urlbarView {
-	position: none !important;
-	transition: none !important;
-}
 #urlbar-background {
 	display: none !important;
 }
@@ -40,6 +37,7 @@
 }
 #urlbar.megabar[breakout][breakout-extend][open] #urlbar-input-container {
 	border-bottom-color: transparent !important;
+	border-radius: 5px 5px 0 0 !important;
 }
 #urlbar.megabar[breakout][breakout-extend][open] .urlbarView {
 	border-radius: 0 0 5px 5px !important;
@@ -118,7 +116,7 @@ toolbarspring {
 	background: var(--gnome-entry-background) !important;
 	width: 100% !important;
 	margin: 0 !important;
-	margin-top: -4px !important;
+	margin-top: -40px !important;
 	box-shadow: none !important;
 	border-top: 0 !important;
 	padding: 0px !important;