--- a/devtools/client/jar.mn
+++ b/devtools/client/jar.mn
@@ -248,18 +248,17 @@ devtools.jar:
     skin/images/debugger-step-out.png (themes/images/debugger-step-out.png)
     skin/images/debugger-step-out@2x.png (themes/images/debugger-step-out@2x.png)
     skin/images/debugger-step-over.png (themes/images/debugger-step-over.png)
     skin/images/debugger-step-over@2x.png (themes/images/debugger-step-over@2x.png)
     skin/images/debugger-blackbox.png (themes/images/debugger-blackbox.png)
     skin/images/debugger-blackbox@2x.png (themes/images/debugger-blackbox@2x.png)
     skin/images/debugger-prettyprint.png (themes/images/debugger-prettyprint.png)
     skin/images/debugger-prettyprint@2x.png (themes/images/debugger-prettyprint@2x.png)
-    skin/images/debugger-toggleBreakpoints.png (themes/images/debugger-toggleBreakpoints.png)
-    skin/images/debugger-toggleBreakpoints@2x.png (themes/images/debugger-toggleBreakpoints@2x.png)
+    skin/images/debugger-toggleBreakpoints.svg (themes/images/debugger-toggleBreakpoints.svg)
     skin/images/tracer-icon.png (themes/images/tracer-icon.png)
     skin/images/tracer-icon@2x.png (themes/images/tracer-icon@2x.png)
     skin/images/responsivemode/responsive-se-resizer.png (themes/images/responsivemode/responsive-se-resizer.png)
     skin/images/responsivemode/responsive-se-resizer@2x.png (themes/images/responsivemode/responsive-se-resizer@2x.png)
     skin/images/responsivemode/responsive-vertical-resizer.png (themes/images/responsivemode/responsive-vertical-resizer.png)
     skin/images/responsivemode/responsive-vertical-resizer@2x.png (themes/images/responsivemode/responsive-vertical-resizer@2x.png)
     skin/images/responsivemode/responsive-horizontal-resizer.png (themes/images/responsivemode/responsive-horizontal-resizer.png)
     skin/images/responsivemode/responsive-horizontal-resizer@2x.png (themes/images/responsivemode/responsive-horizontal-resizer@2x.png)

--- a/devtools/client/themes/debugger.css
+++ b/devtools/client/themes/debugger.css
@@ -61,16 +61,22 @@
 #sources-controls > .devtools-toolbarbutton {
   min-width: 32px;
 }
 
 #sources-toolbar .devtools-toolbarbutton:not([label]) {
   -moz-image-region: rect(0,16px,16px,0);
 }
 
+@media (min-resolution: 1.1dppx) {
+  #sources-toolbar .devtools-toolbarbutton:not([label]) {
+    -moz-image-region: rect(0,32px,32px,0);
+  }
+}
+
 #black-box {
   list-style-image: url(images/debugger-blackbox.png);
 }
 
 @media (min-resolution: 1.1dppx) {
   #black-box {
     list-style-image: url(images/debugger-blackbox@2x.png);
   }
@@ -82,42 +88,29 @@
 
 @media (min-resolution: 1.1dppx) {
   #pretty-print {
     list-style-image: url(images/debugger-prettyprint@2x.png);
   }
 }
 
 #toggle-breakpoints {
-  list-style-image: url(images/debugger-toggleBreakpoints.png);
+  list-style-image: url(images/debugger-toggleBreakpoints.svg);
+  -moz-image-region: rect(0,32px,16px,16px) !important;
 }
 
 #toggle-breakpoints[checked] {
-  -moz-image-region: rect(0,32px,16px,16px) !important;
+  -moz-image-region: rect(0,16px,16px,0) !important;
 }
 
 #toggle-breakpoints[checked] > image {
   /* This button has a special checked image, don't make it blue */
   filter: none;
 }
 
-@media (min-resolution: 1.1dppx) {
-  #sources-toolbar .devtools-toolbarbutton:not([label]) {
-    -moz-image-region: rect(0,32px,32px,0);
-  }
-
-  #toggle-breakpoints {
-    list-style-image: url(images/debugger-toggleBreakpoints@2x.png);
-  }
-
-  #toggle-breakpoints[checked] {
-    -moz-image-region: rect(0,64px,32px,32px) !important;
-  }
-}
-
 #toggle-promise-debugger {
   /* TODO Bug 1186119: Add a toggle promise debugger image */
 }
 
 #sources .black-boxed {
   color: rgba(128,128,128,0.4);
 }
 

deleted file mode 100644
index c4b7dcbfe57454fd7b16212fe6077a1d50c763b6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001

new file mode 100644
--- /dev/null
+++ b/devtools/client/themes/images/debugger-toggleBreakpoints.svg
@@ -0,0 +1,7 @@
+<!-- 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="16" fill="#babec3">
+  <path d="M.485 5C.195 5 0 5.2 0 5.5v5c0 .3.194.5.485.5H13.14c.29 0 .58-.15.727-.35L16 8l-2.133-2.65c-.194-.2-.437-.35-.728-.35H.484z"/>
+  <path d="M19.586 11h-3.1c-.292 0-.486-.2-.486-.5v-5c0-.3.194-.5.485-.5h9.1l3.208-3.207.707-.707L30.914 2.5l-.707.707-11 11-.707.707-1.414-1.414.707-.707L19.586 11zm4.535 0h5.02c.29 0 .58-.15.727-.35L32 8l-2.133-2.65-.048-.047L24.12 11z"/>
+</svg>

deleted file mode 100644
index b8bbadd170b630a1050023af06bf8fff6f395306..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001