--- a/browser/themes/shared/tab-selected.svg
+++ b/browser/themes/shared/tab-selected.svg
@@ -14,23 +14,24 @@
 %endif
       #tab-background-fill {
         background-color: @fgTabBackgroundColor@;
         background-image: @fgTabTexture@;
         background-repeat: no-repeat;
         height: 100%;
         width: 100%;
       }
+%ifndef MOZ_PHOTON_THEME
 %ifdef XP_WIN
-      @media (-moz-windows-default-theme) and (-moz-os-version: windows-vista),
-             (-moz-windows-default-theme) and (-moz-os-version: windows-win7) {
+      @media (-moz-windows-default-theme) and (-moz-os-version: windows-win7) {
         #tab-background-fill {
           background-color: @customToolbarColor@;
         }
       }
 %endif
+%endif
     </style>
 %include ../../base/content/tab-shape.inc.svg
   </defs>
   <foreignObject width="30" height="31" clip-path="url(#tab-curve-clip-path-@TAB_SIDE@)">
     <div id="tab-background-fill" xmlns="http://www.w3.org/1999/xhtml"></div>
   </foreignObject>
 </svg>

--- a/browser/themes/windows/browser-aero.css
+++ b/browser/themes/windows/browser-aero.css
@@ -17,28 +17,26 @@
     -moz-appearance: none;
     border-bottom: none;
   }
 
   .menu-accel,
   .menu-iconic-accel {
     color: graytext;
   }
-
+%ifndef MOZ_PHOTON_THEME
   @media (-moz-os-version: windows-win7) {
     #navigator-toolbox > toolbar:not(#toolbar-menubar):not(#TabsToolbar):not(:-moz-lwtheme),
     #browser-bottombox:not(:-moz-lwtheme),
-    .browserContainer > findbar {
-      background-color: @customToolbarColor@;
-    }
-
+    .browserContainer > findbar,
     .tab-background-middle[selected=true]:not(:-moz-lwtheme) {
       background-color: @customToolbarColor@;
     }
   }
+%endif
 }
 
 @media (-moz-windows-compositor) {
   #main-window {
     -moz-appearance: -moz-win-glass;
   }
 
 

--- a/browser/themes/windows/places/organizer.css
+++ b/browser/themes/windows/places/organizer.css
@@ -179,21 +179,22 @@
 @media (-moz-windows-default-theme) and (-moz-os-version: windows-win7) {
   #placesView,
   #infoPane,
   #placesList,
   #placeContent {
     background-color: #EEF3FA;
   }
 
+%ifndef MOZ_PHOTON_THEME
   #placesToolbar {
     background-color: @customToolbarColor@;
     color: black;
   }
-
+%endif
   #detailsDeck {
     border-top-color: #A9B7C9;
   }
 
   #searchFilter {
     -moz-appearance: none;
     padding: 2px;
     padding-inline-start: 4px;

--- a/browser/themes/windows/windowsShared.inc
+++ b/browser/themes/windows/windowsShared.inc
@@ -3,9 +3,11 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 %filter substitution
 
 %define toolbarHighlight rgba(255,255,255,.4)
 %define fgTabTexture linear-gradient(transparent 2px, @toolbarHighlight@ 2px, @toolbarHighlight@)
 %define fgTabBackgroundColor -moz-dialog
 %define fgTabTextureLWT @fgTabTexture@
+%ifndef MOZ_PHOTON_THEME
 %define customToolbarColor hsl(210,75%,92%)
+%endif