diff --git a/chrome/window_control_fallback_for_custom_windows_theme.css b/chrome/window_control_fallback_for_custom_windows_theme.css
new file mode 100644
index 0000000..6e0e177
--- /dev/null
+++ b/chrome/window_control_fallback_for_custom_windows_theme.css
@@ -0,0 +1,16 @@
+/* Source file https://github.com/MrOtherGuy/firefox-csshacks/tree/master/chrome/window_control_fallback_for_custom_windows_theme.css made available under Mozilla Public License v. 2.0
+See the above repository for updates as well as full license text. */
+
+/* If one uses custom Windows theme, then Firefox uses high-contrast window control buttons. This style makes Firefox fall back to using normal window control style. */
+
+.titlebar-button{
+  background-color: transparent !important;
+  stroke: currentColor !important;
+}
+.titlebar-button:hover{ background-color: hsla(0,0%,100%,.32) !important }
+.titlebar-close:hover{ background-color: hsl(355,86%,49%) !important }
+
+.titlebar-close{ list-style-image: url(chrome://browser/skin/window-controls/close.svg) !important }
+.titlebar-min{ list-style-image: url(chrome://browser/skin/window-controls/minimize.svg) !important }
+.titlebar-max{ list-style-image: url(chrome://browser/skin/window-controls/maximize.svg) !important }
+.titlebar-restore{ list-style-image: url(chrome://browser/skin/window-controls/restore.svg) !important }
\ No newline at end of file
diff --git a/html_resources/tagmap.json b/html_resources/tagmap.json
index e177541..49b8358 100644
--- a/html_resources/tagmap.json
+++ b/html_resources/tagmap.json
@@ -112,5 +112,6 @@
 "centered_top_statuspanel.css":["status"],
 "custom_menupopup_check_icons.css":["icon","menu","minimal","popup"],
 "show_toolbars_in_popup_windows.css":["toolbars","popup"],
-"centered_tab_content.css":["tab","icon"]
+"centered_tab_content.css":["tab","icon"],
+"window_control_fallback_for_custom_windows_theme.css":["window-controls","buttons","colors","patch"]
 }
diff --git a/tags.csv b/tags.csv
index aed142b..a178750 100644
--- a/tags.csv
+++ b/tags.csv
@@ -112,3 +112,4 @@ centered_top_statuspanel.css,status
 custom_menupopup_check_icons.css,icon,menu,minimal,popup
 show_toolbars_in_popup_windows.css,toolbars,popup
 centered_tab_content.css,tab,icon
+window_control_fallback_for_custom_windows_theme.css,window-controls,buttons,colors,patch