--- a/browser/themes/shared/browser.inc.css
+++ b/browser/themes/shared/browser.inc.css
@@ -13,48 +13,54 @@
   /* Note: Setting this to 0 (without px) breaks CSS calculations for OSX. */
   --space-above-tabbar: 0px;
 }
 
 :root[extradragspace][tabsintitlebar]:not([inFullscreen]) {
   --space-above-tabbar: 8px;
 }
 
-:root:-moz-lwtheme {
+:root[sessionrestored]:-moz-lwtheme {
   transition: @themeTransition@;
 }
 
 /* Toolbar / content area border */
 
 #navigator-toolbox::after {
   content: "";
   display: -moz-box;
   border-bottom: 1px solid var(--toolbox-border-bottom-color);
 }
 
 :root[customizing] #navigator-toolbox::after {
   border-bottom-style: none;
 }
 
-#nav-bar:-moz-lwtheme {
+:root[sessionrestored] #nav-bar:-moz-lwtheme {
   transition: @themeTransition@;
 }
 
 /* Bookmark toolbar */
 
 #navigator-toolbox > toolbar:not(#toolbar-menubar):not(#TabsToolbar):not(#nav-bar) {
   overflow: -moz-hidden-unscrollable;
   max-height: 4em;
+  padding: 0 6px 2px;
+}
+
+:root[sessionrestored] #navigator-toolbox > toolbar:not(#toolbar-menubar):not(#TabsToolbar):not(#nav-bar) {
   transition: min-height 170ms ease-out, max-height 170ms ease-out, @themeTransition@;
-  padding: 0 6px 2px;
 }
 
 #navigator-toolbox > toolbar:not(#toolbar-menubar):not(#TabsToolbar):not(#nav-bar)[collapsed=true] {
   min-height: 0.1px;
   max-height: 0;
+}
+
+:root[sessionrestored] #navigator-toolbox > toolbar:not(#toolbar-menubar):not(#TabsToolbar):not(#nav-bar)[collapsed=true] {
   transition: min-height 170ms ease-out, max-height 170ms ease-out, visibility 170ms linear;
 }
 
 #navigator-toolbox > toolbar[customizing]:not(#toolbar-menubar):not(#TabsToolbar):not(#nav-bar) {
   outline: 1px dashed;
   outline-offset: -3px;
   -moz-outline-radius: 2px;
 }