diff --git a/browser/extensions/webcompat-reporter/jar.mn b/browser/extensions/webcompat-reporter/jar.mn
index 3f94c20b8f57..104b2359f7fb 100644
--- a/browser/extensions/webcompat-reporter/jar.mn
+++ b/browser/extensions/webcompat-reporter/jar.mn
@@ -4,6 +4,22 @@
 
 [features/webcompat-reporter@mozilla.org] chrome.jar:
 % content webcompat-reporter %content/
+  content/ (content/*)
 % skin webcompat-reporter classic/1.0 %skin/
-  content/  (content/*)
-  skin/  (skin/*)
+#ifdef XP_WIN
+  skin/   (skin/windows/*)
+% override chrome://webcompat-reporter/skin/lightbulb.png    chrome://webcompat-reporter/skin/lightbulb-win7.png    osversion=6.1
+% override chrome://webcompat-reporter/skin/lightbulb@2x.png chrome://webcompat-reporter/skin/lightbulb-win7@2x.png osversion=6.1
+% override chrome://webcompat-reporter/skin/lightbulb.png    chrome://webcompat-reporter/skin/lightbulb-win8.png    osversion=6.2
+% override chrome://webcompat-reporter/skin/lightbulb@2x.png chrome://webcompat-reporter/skin/lightbulb-win8@2x.png osversion=6.2
+% override chrome://webcompat-reporter/skin/lightbulb.png    chrome://webcompat-reporter/skin/lightbulb-win8.png    osversion=6.3
+% override chrome://webcompat-reporter/skin/lightbulb@2x.png chrome://webcompat-reporter/skin/lightbulb-win8@2x.png osversion=6.3
+#elifdef XP_MACOSX
+  skin/   (skin/osx/*)
+% override chrome://webcompat-reporter/skin/lightbulb.png    chrome://webcompat-reporter/skin/lightbulb-yosemite.png    osversion>=10.10
+% override chrome://webcompat-reporter/skin/lightbulb@2x.png chrome://webcompat-reporter/skin/lightbulb-yosemite@2x.png osversion>=10.10
+#else
+  skin/   (skin/linux/*)
+#endif
+  skin/lightbulb.css (skin/shared/lightbulb.css)
+* skin/lightbulb.svg (skin/shared/lightbulb.svg)
diff --git a/browser/extensions/webcompat-reporter/skin/lightbulb.css b/browser/extensions/webcompat-reporter/skin/lightbulb.css
deleted file mode 100644
index 4ea51b043c2c..000000000000
--- a/browser/extensions/webcompat-reporter/skin/lightbulb.css
+++ /dev/null
@@ -1,6 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-#webcompat-reporter-button {
-  list-style-image: url("chrome://webcompat-reporter/skin/lightbulb.svg");
-}
diff --git a/browser/extensions/webcompat-reporter/skin/lightbulb.svg b/browser/extensions/webcompat-reporter/skin/lightbulb.svg
deleted file mode 100644
index a4c2a8095d03..000000000000
--- a/browser/extensions/webcompat-reporter/skin/lightbulb.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 85 128">
-  <path d="M85.23,34.52v-7L43.34,35.21v6.94Zm0-16L43.34,26.28v6.94L85.23,25.5Zm-2.86-1.47v-.26A15,15,0,0,0,81.58,12h0a1.23,1.23,0,0,1-.17-.52,3.62,3.62,0,0,0-.35-.87.3.3,0,0,0-.09-.17h0A18.33,18.33,0,0,0,64.15,0C55.91,0,49,5,46.72,12h25.5L45.94,16.82l-2.6.43v7l4.08-.78Z" transform="translate(-23.46)" fill-opacity="0.6"/>
-  <path d="M28.65,92.41c1.7,18,14.52,30.59,35.83,30.59s34.13-12.61,35.83-30.59c1.33-18.21-4.72-23.88-12.75-35.61a36.8,36.8,0,0,1-5.23-11.57s-24.25.29-24.33,0H46.71A36.8,36.8,0,0,1,41.47,56.8C33.36,68.52,27.32,74.2,28.65,92.41Z" transform="translate(-23.46)" fill="none" stroke="#000" stroke-opacity="0.6" stroke-width="10"/>
-  <path d="M82.11,86.19c-.17-.26-.35-.43-.61-2L70.83,51.58c-1.13.17-.69.17-1.13.17h-.78c-.52.17-.35.78-.17,1.3L78.81,83.67a11.18,11.18,0,0,0-8-1,7.69,7.69,0,0,0-1.47.69l-4.25-1.3a8.07,8.07,0,0,0-4.94,1.65,11.54,11.54,0,0,0-2.6-1,10.73,10.73,0,0,0-7.46.52L60,53.14a3.83,3.83,0,0,0,.26-1.39c-2.25-.09-2.25.09-2.17.69L47.24,85.58a1.2,1.2,0,0,0-.26.35,1,1,0,1,0,1.56,1.21c2-2.52,4.86-3.3,8.5-2.34a5.55,5.55,0,0,1,1.65.61,5.19,5.19,0,0,0-.87,3.12c.09,2.25.87,3.82,2.08,4.42a2.16,2.16,0,0,0,2.17-.09c1-.69,1.56-2.34,1.39-4.42a5.24,5.24,0,0,0-1.65-3.38,6.35,6.35,0,0,1,6-.17,6.65,6.65,0,0,0-1.13,3.56c-.09,2,.52,3.56,1.65,4.25a2.48,2.48,0,0,0,2.34.09c1.13-.69,1.82-2.25,1.73-4.25A5.78,5.78,0,0,0,71,84.88c.17-.09.26-.09.43-.17,3-1,7.46.78,9.11,2.78a1,1,0,0,0,1.39.17A1.09,1.09,0,0,0,82.11,86.19ZM60.86,91.13h-.09a3.58,3.58,0,0,1-1-2.69,4,4,0,0,1,.52-2,3,3,0,0,1,1,2.08C61.55,90.09,61.2,91,60.86,91.13ZM69.62,91h-.09a.27.27,0,0,1-.17-.09c-.26-.17-.78-.87-.69-2.43A5.31,5.31,0,0,1,69.36,86a3.51,3.51,0,0,1,1,2.34C70.31,90.09,69.88,90.78,69.62,91Z" transform="translate(-23.46)" fill="none" stroke="#000" stroke-opacity="0.6" stroke-width="5"/>
-</svg>
diff --git a/browser/extensions/webcompat-reporter/skin/linux/lightbulb-inverted.png b/browser/extensions/webcompat-reporter/skin/linux/lightbulb-inverted.png
new file mode 100644
index 000000000000..5d3cb8ee0e22
Binary files /dev/null and b/browser/extensions/webcompat-reporter/skin/linux/lightbulb-inverted.png differ
diff --git a/browser/extensions/webcompat-reporter/skin/linux/lightbulb-inverted@2x.png b/browser/extensions/webcompat-reporter/skin/linux/lightbulb-inverted@2x.png
new file mode 100644
index 000000000000..d1c896a29277
Binary files /dev/null and b/browser/extensions/webcompat-reporter/skin/linux/lightbulb-inverted@2x.png differ
diff --git a/browser/extensions/webcompat-reporter/skin/linux/lightbulb.png b/browser/extensions/webcompat-reporter/skin/linux/lightbulb.png
new file mode 100644
index 000000000000..06825536dbaa
Binary files /dev/null and b/browser/extensions/webcompat-reporter/skin/linux/lightbulb.png differ
diff --git a/browser/extensions/webcompat-reporter/skin/linux/lightbulb@2x.png b/browser/extensions/webcompat-reporter/skin/linux/lightbulb@2x.png
new file mode 100644
index 000000000000..636e434ffd35
Binary files /dev/null and b/browser/extensions/webcompat-reporter/skin/linux/lightbulb@2x.png differ
diff --git a/browser/extensions/webcompat-reporter/skin/osx/lightbulb-inverted.png b/browser/extensions/webcompat-reporter/skin/osx/lightbulb-inverted.png
new file mode 100644
index 000000000000..caa8d308e2e5
Binary files /dev/null and b/browser/extensions/webcompat-reporter/skin/osx/lightbulb-inverted.png differ
diff --git a/browser/extensions/webcompat-reporter/skin/osx/lightbulb-inverted@2x.png b/browser/extensions/webcompat-reporter/skin/osx/lightbulb-inverted@2x.png
new file mode 100644
index 000000000000..6a9ae138176e
Binary files /dev/null and b/browser/extensions/webcompat-reporter/skin/osx/lightbulb-inverted@2x.png differ
diff --git a/browser/extensions/webcompat-reporter/skin/osx/lightbulb-yosemite.png b/browser/extensions/webcompat-reporter/skin/osx/lightbulb-yosemite.png
new file mode 100644
index 000000000000..b0bf2360bc5d
Binary files /dev/null and b/browser/extensions/webcompat-reporter/skin/osx/lightbulb-yosemite.png differ
diff --git a/browser/extensions/webcompat-reporter/skin/osx/lightbulb-yosemite@2x.png b/browser/extensions/webcompat-reporter/skin/osx/lightbulb-yosemite@2x.png
new file mode 100644
index 000000000000..940e340f3f24
Binary files /dev/null and b/browser/extensions/webcompat-reporter/skin/osx/lightbulb-yosemite@2x.png differ
diff --git a/browser/extensions/webcompat-reporter/skin/osx/lightbulb.png b/browser/extensions/webcompat-reporter/skin/osx/lightbulb.png
new file mode 100644
index 000000000000..f82fb2d1de73
Binary files /dev/null and b/browser/extensions/webcompat-reporter/skin/osx/lightbulb.png differ
diff --git a/browser/extensions/webcompat-reporter/skin/osx/lightbulb@2x.png b/browser/extensions/webcompat-reporter/skin/osx/lightbulb@2x.png
new file mode 100644
index 000000000000..3831e75c4bad
Binary files /dev/null and b/browser/extensions/webcompat-reporter/skin/osx/lightbulb@2x.png differ
diff --git a/browser/extensions/webcompat-reporter/skin/shared/lightbulb.css b/browser/extensions/webcompat-reporter/skin/shared/lightbulb.css
new file mode 100644
index 000000000000..f0523daf34a0
--- /dev/null
+++ b/browser/extensions/webcompat-reporter/skin/shared/lightbulb.css
@@ -0,0 +1,26 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+#webcompat-reporter-button[cui-areatype="menu-panel"] {
+  list-style-image: url("chrome://webcompat-reporter/skin/lightbulb.svg");
+}
+
+#webcompat-reporter-button[cui-areatype="toolbar"] {
+  list-style-image: url("chrome://webcompat-reporter/skin/lightbulb.png");
+  -moz-image-region: rect(0, 18px, 18px, 0);
+}
+
+toolbar[brighttext] #webcompat-reporter-button {
+ list-style-image: url("chrome://webcompat-reporter/skin/lightbulb-inverted.png");
+}
+
+@media (min-resolution: 1.1dppx) {
+  #webcompat-reporter-button[cui-areatype="toolbar"] {
+    list-style-image: url("chrome://webcompat-reporter/skin/lightbulb@2x.png");
+    -moz-image-region: rect(0, 36px, 36px, 0px);
+  }
+
+  toolbar[brighttext] #webcompat-reporter-button {
+    list-style-image: url("chrome://webcompat-reporter/skin/lightbulb-inverted@2x.png");
+  }
+}
diff --git a/browser/extensions/webcompat-reporter/skin/shared/lightbulb.svg b/browser/extensions/webcompat-reporter/skin/shared/lightbulb.svg
new file mode 100644
index 000000000000..5c8e9120c48a
--- /dev/null
+++ b/browser/extensions/webcompat-reporter/skin/shared/lightbulb.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg"
+     width="32" height="32" class="fieldtext">
+#include ../../../../../browser/themes/shared/icon-colors.inc.svg
+
+  <path d="M11.5,8.3h.1l9-1a.8.8,0,0,0-.2-1.5l-9,1a.8.8,0,0,0,.1,1.5Zm2.4,13.5a.3.3,0,0,0,.1.2h.9a.3.3,0,0,0,.1-.2,1.8,1.8,0,0,0-.5-1.1A1.8,1.8,0,0,0,13.9,21.7ZM11.5,6.3h.1l8-1a.7.7,0,0,0,.7-.8.7.7,0,0,0-.3-.5A4.4,4.4,0,0,0,16,1c-3,0-4,3-4,3h5.5l-6,.8a.7.7,0,0,0,.1,1.5ZM17,21.8c0,.1,0,.3.5.3h.4a.4.4,0,0,0,.1-.3,1.8,1.8,0,0,0-.4-1A1.9,1.9,0,0,0,17,21.8Zm5.3-8.9-1.1-2.2a1,1,0,0,0-.9-.6H13.8l6.8-.8a.8.8,0,0,0-.2-1.5l-9,1a.8.8,0,0,0-.7.8.7.7,0,0,0,.4.6l-.4.5L9.7,12.8C8.5,15,6,17,6,21.5A9.6,9.6,0,0,0,16,31a9.6,9.6,0,0,0,10-9.5C26,17,23.5,15,22.3,12.8Zm0,7.7a.5.5,0,0,1-.6,0,3.8,3.8,0,0,0-2.2-.8l-1.1.3a2.7,2.7,0,0,1,.6,1.6,1.4,1.4,0,0,1-.4,1,1.6,1.6,0,0,1-1.1.4A1.3,1.3,0,0,1,16,21.8a2.8,2.8,0,0,1,.8-1.8,1.8,1.8,0,0,0-1.7,0,2.8,2.8,0,0,1,.7,1.7,1.3,1.3,0,0,1-.4.9,1.5,1.5,0,0,1-1,.4,1.8,1.8,0,0,1-1.2-.4,1.3,1.3,0,0,1-.4-1,2.7,2.7,0,0,1,.7-1.7,2.5,2.5,0,0,0-1.2-.3,3.8,3.8,0,0,0-2.1.7.5.5,0,0,1-.7-.6l4.6-8.5a.5.5,0,1,1,.9.5l-3.9,7.2,1.2-.2a3.6,3.6,0,0,1,2,.6,2.8,2.8,0,0,1,3.3,0,3.5,3.5,0,0,1,1.9-.5l1.3.2L17,11.8a.5.5,0,1,1,.9-.5l4.5,8.6A.5.5,0,0,1,22.3,20.6Z"/>
+</svg>
diff --git a/browser/extensions/webcompat-reporter/skin/windows/lightbulb-inverted.png b/browser/extensions/webcompat-reporter/skin/windows/lightbulb-inverted.png
new file mode 100644
index 000000000000..5d3cb8ee0e22
Binary files /dev/null and b/browser/extensions/webcompat-reporter/skin/windows/lightbulb-inverted.png differ
diff --git a/browser/extensions/webcompat-reporter/skin/windows/lightbulb-inverted@2x.png b/browser/extensions/webcompat-reporter/skin/windows/lightbulb-inverted@2x.png
new file mode 100644
index 000000000000..d1c896a29277
Binary files /dev/null and b/browser/extensions/webcompat-reporter/skin/windows/lightbulb-inverted@2x.png differ
diff --git a/browser/extensions/webcompat-reporter/skin/windows/lightbulb-win7.png b/browser/extensions/webcompat-reporter/skin/windows/lightbulb-win7.png
new file mode 100644
index 000000000000..8efdc9366d08
Binary files /dev/null and b/browser/extensions/webcompat-reporter/skin/windows/lightbulb-win7.png differ
diff --git a/browser/extensions/webcompat-reporter/skin/windows/lightbulb-win7@2x.png b/browser/extensions/webcompat-reporter/skin/windows/lightbulb-win7@2x.png
new file mode 100644
index 000000000000..2ecd5866c930
Binary files /dev/null and b/browser/extensions/webcompat-reporter/skin/windows/lightbulb-win7@2x.png differ
diff --git a/browser/extensions/webcompat-reporter/skin/windows/lightbulb-win8.png b/browser/extensions/webcompat-reporter/skin/windows/lightbulb-win8.png
new file mode 100644
index 000000000000..932445d769fa
Binary files /dev/null and b/browser/extensions/webcompat-reporter/skin/windows/lightbulb-win8.png differ
diff --git a/browser/extensions/webcompat-reporter/skin/windows/lightbulb-win8@2x.png b/browser/extensions/webcompat-reporter/skin/windows/lightbulb-win8@2x.png
new file mode 100644
index 000000000000..5fd6b8a0bca7
Binary files /dev/null and b/browser/extensions/webcompat-reporter/skin/windows/lightbulb-win8@2x.png differ
diff --git a/browser/extensions/webcompat-reporter/skin/windows/lightbulb.png b/browser/extensions/webcompat-reporter/skin/windows/lightbulb.png
new file mode 100644
index 000000000000..72415ae9ac8b
Binary files /dev/null and b/browser/extensions/webcompat-reporter/skin/windows/lightbulb.png differ
diff --git a/browser/extensions/webcompat-reporter/skin/windows/lightbulb@2x.png b/browser/extensions/webcompat-reporter/skin/windows/lightbulb@2x.png
new file mode 100644
index 000000000000..d2dbc54d611e
Binary files /dev/null and b/browser/extensions/webcompat-reporter/skin/windows/lightbulb@2x.png differ