diff --git a/src/plugins/debugger/debugger.qrc b/src/plugins/debugger/debugger.qrc
index d7bd49643d1..91ff450ccbc 100644
--- a/src/plugins/debugger/debugger.qrc
+++ b/src/plugins/debugger/debugger.qrc
@@ -13,29 +13,30 @@
         <file>images/debugger_interrupt@2x.png</file>
         <file>images/debugger_interrupt_mask.png</file>
         <file>images/debugger_interrupt_mask@2x.png</file>
-        <file>images/debugger_reversemode_16.png</file>
+        <file>images/debugger_reversemode.png</file>
+        <file>images/debugger_reversemode@2x.png</file>
+        <file>images/debugger_reversemode_background.png</file>
+        <file>images/debugger_reversemode_background@2x.png</file>
         <file>images/debugger_singleinstructionmode.png</file>
         <file>images/debugger_singleinstructionmode@2x.png</file>
-        <file>images/debugger_snapshot_small.png</file>
         <file>images/debugger_stepinto_small.png</file>
         <file>images/debugger_stepinto_small@2x.png</file>
-        <file>images/debugger_steponeproc_small.png</file>
         <file>images/debugger_stepout_small.png</file>
         <file>images/debugger_stepout_small@2x.png</file>
         <file>images/debugger_stepover_small.png</file>
         <file>images/debugger_stepover_small@2x.png</file>
-        <file>images/debugger_stepoverproc_small.png</file>
         <file>images/watchpoint.png</file>
         <file>images/tracepoint.png</file>
-        <file>images/breakpoint_16.png</file>
-        <file>images/breakpoint_24.png</file>
-        <file>images/breakpoint_disabled_16.png</file>
-        <file>images/breakpoint_disabled_24.png</file>
-        <file>images/breakpoint_disabled_32.png</file>
-        <file>images/breakpoint_pending_16.png</file>
-        <file>images/breakpoint_pending_24.png</file>
-        <file>images/location_16.png</file>
-        <file>images/location_24.png</file>
+        <file>images/breakpoint.png</file>
+        <file>images/breakpoint@2x.png</file>
+        <file>images/breakpoint_disabled.png</file>
+        <file>images/breakpoint_disabled@2x.png</file>
+        <file>images/breakpoint_pending_overlay.png</file>
+        <file>images/breakpoint_pending_overlay@2x.png</file>
+        <file>images/location.png</file>
+        <file>images/location@2x.png</file>
+        <file>images/location_background.png</file>
+        <file>images/location_background@2x.png</file>
         <file>images/mode_debug.png</file>
         <file>images/mode_debug@2x.png</file>
         <file>images/mode_debug_mask.png</file>
@@ -43,7 +44,6 @@
         <file>images/pin.xpm</file>
         <file>images/qml/select.png</file>
         <file>images/qml/app-on-top.png</file>
-        <file>images/qml/apply-on-save.png</file>
         <file>images/debugger_restart_small.png</file>
         <file>images/debugger_restart_small@2x.png</file>
         <file>images/recordfill.png</file>
diff --git a/src/plugins/debugger/debuggericons.h b/src/plugins/debugger/debuggericons.h
index 3c94306ccc3..1d98a1d40fd 100644
--- a/src/plugins/debugger/debuggericons.h
+++ b/src/plugins/debugger/debuggericons.h
@@ -31,12 +31,13 @@
 namespace Debugger {
 namespace Icons {
 
-const Utils::Icon BREAKPOINT(
-        QLatin1String(":/debugger/images/breakpoint_16.png"));
-const Utils::Icon BREAKPOINT_DISABLED(
-        QLatin1String(":/debugger/images/breakpoint_disabled_16.png"));
-const Utils::Icon BREAKPOINT_PENDING(
-        QLatin1String(":/debugger/images/breakpoint_pending_16.png"));
+const Utils::Icon BREAKPOINT({
+        {QLatin1String(":/debugger/images/breakpoint.png"), Utils::Theme::IconsErrorColor}}, Utils::Icon::Tint);
+const Utils::Icon BREAKPOINT_DISABLED({
+        {QLatin1String(":/debugger/images/breakpoint_disabled.png"), Utils::Theme::IconsErrorColor}}, Utils::Icon::Tint);
+const Utils::Icon BREAKPOINT_PENDING({
+        {QLatin1String(":/debugger/images/breakpoint.png"), Utils::Theme::IconsErrorColor},
+        {QLatin1String(":/debugger/images/breakpoint_pending_overlay.png"), Utils::Theme::PanelTextColorDark}}, Utils::Icon::IconStyleOptions(Utils::Icon::Tint | Utils::Icon::PunchEdges));
 const Utils::Icon BREAKPOINTS(
         QLatin1String(":/debugger/images/debugger_breakpoints.png"));
 const Utils::Icon WATCHPOINT(
@@ -64,14 +65,12 @@ const Utils::Icon DEBUG_INTERRUPT_SMALL({
 const Utils::Icon DEBUG_EXIT_SMALL({
         {QLatin1String(":/core/images/stop_small.png"), Utils::Theme::IconsStopColor},
         {QLatin1String(":/projectexplorer/images/debugger_overlay_small.png"), Utils::Theme::IconsDebugColor}});
-const Utils::Icon LOCATION(
-        QLatin1String(":/debugger/images/location_16.png"));
-const Utils::Icon SNAPSHOT(
-        QLatin1String(":/debugger/images/debugger_snapshot_small.png"));
-const Utils::Icon REVERSE_MODE(
-        QLatin1String(":/debugger/images/debugger_reversemode_16.png"));
-const Utils::Icon APPLY_ON_SAVE(
-        QLatin1String(":/debugger/images/qml/apply-on-save.png"));
+const Utils::Icon LOCATION({
+        {QLatin1String(":/debugger/images/location_background.png"), Utils::Theme::IconsCodeModelOverlayForegroundColor},
+        {QLatin1String(":/debugger/images/location.png"), Utils::Theme::IconsWarningToolBarColor}}, Utils::Icon::Tint);
+const Utils::Icon REVERSE_MODE({
+        {QLatin1String(":/debugger/images/debugger_reversemode_background.png"), Utils::Theme::IconsCodeModelOverlayForegroundColor},
+        {QLatin1String(":/debugger/images/debugger_reversemode.png"), Utils::Theme::IconsInfoColor}}, Utils::Icon::Tint);
 const Utils::Icon APP_ON_TOP(
         QLatin1String(":/debugger/images/qml/app-on-top.png"));
 const Utils::Icon SELECT(
diff --git a/src/plugins/debugger/images/breakpoint.png b/src/plugins/debugger/images/breakpoint.png
new file mode 100644
index 00000000000..57dc3054c83
Binary files /dev/null and b/src/plugins/debugger/images/breakpoint.png differ
diff --git a/src/plugins/debugger/images/breakpoint.svg b/src/plugins/debugger/images/breakpoint.svg
deleted file mode 100644
index e8d63cc9037..00000000000
--- a/src/plugins/debugger/images/breakpoint.svg
+++ /dev/null
@@ -1,154 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="14"
-   height="14"
-   id="svg2270"
-   sodipodi:version="0.32"
-   inkscape:version="0.45.1"
-   version="1.0"
-   sodipodi:docbase="D:\depot\research\main\editor\images"
-   sodipodi:docname="breakpoint.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs2272">
-    <linearGradient
-       id="linearGradient7029">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop7031" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop7033" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient17794">
-      <stop
-         style="stop-color:#f18383;stop-opacity:1;"
-         offset="0"
-         id="stop17798" />
-      <stop
-         id="stop8006"
-         offset="0.3807947"
-         style="stop-color:#ed6767;stop-opacity:1;" />
-      <stop
-         style="stop-color:#e62323;stop-opacity:1;"
-         offset="1"
-         id="stop17796" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient17794"
-       id="linearGradient24732"
-       gradientUnits="userSpaceOnUse"
-       x1="472.42236"
-       y1="436.79602"
-       x2="461.39169"
-       y2="424.95065" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient17794"
-       id="linearGradient2438"
-       gradientUnits="userSpaceOnUse"
-       x1="472.42236"
-       y1="436.79602"
-       x2="461.39169"
-       y2="424.95065" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient17794"
-       id="radialGradient6052"
-       cx="466.73566"
-       cy="431.19708"
-       fx="466.73566"
-       fy="431.19708"
-       r="9.3095722"
-       gradientTransform="matrix(1,0,0,1.0057859,0,-2.4948735)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient7029"
-       id="linearGradient7035"
-       x1="6.75"
-       y1="0.5"
-       x2="6.75"
-       y2="12.5"
-       gradientUnits="userSpaceOnUse" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     gridtolerance="10000"
-     guidetolerance="10"
-     objecttolerance="10"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="32"
-     inkscape:cx="8.6877264"
-     inkscape:cy="6.3888789"
-     inkscape:document-units="px"
-     inkscape:current-layer="g25843"
-     width="14px"
-     height="14px"
-     inkscape:window-width="1280"
-     inkscape:window-height="998"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     showgrid="true"
-     gridspacingx="0.5px"
-     gridspacingy="0.5px"
-     gridempspacing="2"
-     inkscape:grid-points="true" />
-  <metadata
-     id="metadata2275">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <g
-       id="g25843"
-       transform="matrix(0.7931251,0,0,0.7931251,-372.13374,-408.22195)">
-      <path
-         sodipodi:type="arc"
-         style="fill:url(#radialGradient6052);fill-opacity:1.0;stroke:#c80000;stroke-width:1.43637741;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         id="path22737"
-         sodipodi:cx="466.73566"
-         sodipodi:cy="431.19708"
-         sodipodi:rx="8.5913839"
-         sodipodi:ry="8.6452484"
-         d="M 475.32704 431.19708 A 8.5913839 8.6452484 0 1 1  458.14427,431.19708 A 8.5913839 8.6452484 0 1 1  475.32704 431.19708 z"
-         transform="matrix(0.8805346,0,0,0.8750503,66.41784,145.57686)" />
-      <path
-         sodipodi:type="arc"
-         style="opacity:1;fill:url(#linearGradient7035);fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         id="path6058"
-         sodipodi:cx="6.75"
-         sodipodi:cy="6.5"
-         sodipodi:rx="5.75"
-         sodipodi:ry="6"
-         d="M 12.5 6.5 A 5.75 6 0 1 1  1,6.5 A 5.75 6 0 1 1  12.5 6.5 z"
-         transform="matrix(0.9867408,0,0,0.6304178,470.73423,515.01579)" />
-    </g>
-  </g>
-</svg>
diff --git a/src/plugins/debugger/images/breakpoint@2x.png b/src/plugins/debugger/images/breakpoint@2x.png
new file mode 100644
index 00000000000..d4062c909c2
Binary files /dev/null and b/src/plugins/debugger/images/breakpoint@2x.png differ
diff --git a/src/plugins/debugger/images/breakpoint_16.png b/src/plugins/debugger/images/breakpoint_16.png
deleted file mode 100644
index 54123120247..00000000000
Binary files a/src/plugins/debugger/images/breakpoint_16.png and /dev/null differ
diff --git a/src/plugins/debugger/images/breakpoint_24.png b/src/plugins/debugger/images/breakpoint_24.png
deleted file mode 100644
index 092d2e3c862..00000000000
Binary files a/src/plugins/debugger/images/breakpoint_24.png and /dev/null differ
diff --git a/src/plugins/debugger/images/breakpoint_disabled.png b/src/plugins/debugger/images/breakpoint_disabled.png
new file mode 100644
index 00000000000..ec15f81c0b8
Binary files /dev/null and b/src/plugins/debugger/images/breakpoint_disabled.png differ
diff --git a/src/plugins/debugger/images/breakpoint_disabled.svg b/src/plugins/debugger/images/breakpoint_disabled.svg
deleted file mode 100644
index afe229b6ca2..00000000000
--- a/src/plugins/debugger/images/breakpoint_disabled.svg
+++ /dev/null
@@ -1,171 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="14"
-   height="14"
-   id="svg2270"
-   sodipodi:version="0.32"
-   inkscape:version="0.46"
-   version="1.0"
-   sodipodi:docbase="D:\depot\research\main\editor\images"
-   sodipodi:docname="breakpoint_disabled.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs2272">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 7 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="14 : 7 : 1"
-       inkscape:persp3d-origin="7 : 4.6666667 : 1"
-       id="perspective21" />
-    <linearGradient
-       id="linearGradient7029">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop7031" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop7033" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient17794">
-      <stop
-         style="stop-color:#f18383;stop-opacity:1;"
-         offset="0"
-         id="stop17798" />
-      <stop
-         id="stop8006"
-         offset="0.3807947"
-         style="stop-color:#ed6767;stop-opacity:1;" />
-      <stop
-         style="stop-color:#e62323;stop-opacity:1;"
-         offset="1"
-         id="stop17796" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient17794"
-       id="linearGradient24732"
-       gradientUnits="userSpaceOnUse"
-       x1="472.42236"
-       y1="436.79602"
-       x2="461.39169"
-       y2="424.95065" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient17794"
-       id="linearGradient2438"
-       gradientUnits="userSpaceOnUse"
-       x1="472.42236"
-       y1="436.79602"
-       x2="461.39169"
-       y2="424.95065" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient7029"
-       id="radialGradient6052"
-       cx="466.73566"
-       cy="431.19708"
-       fx="466.73566"
-       fy="431.19708"
-       r="9.3095722"
-       gradientTransform="matrix(1,0,0,1.0057859,0,-2.4948735)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient7029"
-       id="linearGradient7035"
-       x1="6.75"
-       y1="0.5"
-       x2="6.75"
-       y2="12.5"
-       gradientUnits="userSpaceOnUse" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     gridtolerance="10000"
-     guidetolerance="10"
-     objecttolerance="10"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="32"
-     inkscape:cx="3.1721014"
-     inkscape:cy="6.3888789"
-     inkscape:document-units="px"
-     inkscape:current-layer="g25843"
-     width="14px"
-     height="14px"
-     inkscape:window-width="1280"
-     inkscape:window-height="998"
-     inkscape:window-x="86"
-     inkscape:window-y="122"
-     showgrid="true"
-     inkscape:grid-points="true">
-    <inkscape:grid
-       id="GridFromPre046Settings"
-       type="xygrid"
-       originx="0px"
-       originy="0px"
-       spacingx="0.5px"
-       spacingy="0.5px"
-       color="#0000ff"
-       empcolor="#0000ff"
-       opacity="0.2"
-       empopacity="0.4"
-       empspacing="2" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata2275">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <g
-       id="g25843"
-       transform="matrix(0.7931251,0,0,0.7931251,-372.13374,-408.22195)">
-      <path
-         sodipodi:type="arc"
-         style="fill:url(#radialGradient6052);fill-opacity:1.0;stroke:#c80000;stroke-width:1.43637740999999997;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;opacity:1"
-         id="path22737"
-         sodipodi:cx="466.73566"
-         sodipodi:cy="431.19708"
-         sodipodi:rx="8.5913839"
-         sodipodi:ry="8.6452484"
-         d="M 475.32704,431.19708 A 8.5913839,8.6452484 0 1 1 458.14427,431.19708 A 8.5913839,8.6452484 0 1 1 475.32704,431.19708 z"
-         transform="matrix(0.8805346,0,0,0.8750503,67.048249,146.20731)" />
-      <path
-         sodipodi:type="arc"
-         style="opacity:1;fill:url(#linearGradient7035);fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         id="path6058"
-         sodipodi:cx="6.75"
-         sodipodi:cy="6.5"
-         sodipodi:rx="5.75"
-         sodipodi:ry="6"
-         d="M 12.5,6.5 A 5.75,6 0 1 1 1,6.5 A 5.75,6 0 1 1 12.5,6.5 z"
-         transform="matrix(1.3156535,0,0,1.31337,469.14448,515.30473)" />
-    </g>
-  </g>
-</svg>
diff --git a/src/plugins/debugger/images/breakpoint_disabled@2x.png b/src/plugins/debugger/images/breakpoint_disabled@2x.png
new file mode 100644
index 00000000000..0349dbcd477
Binary files /dev/null and b/src/plugins/debugger/images/breakpoint_disabled@2x.png differ
diff --git a/src/plugins/debugger/images/breakpoint_disabled_16.png b/src/plugins/debugger/images/breakpoint_disabled_16.png
deleted file mode 100644
index 6734bd1409d..00000000000
Binary files a/src/plugins/debugger/images/breakpoint_disabled_16.png and /dev/null differ
diff --git a/src/plugins/debugger/images/breakpoint_disabled_24.png b/src/plugins/debugger/images/breakpoint_disabled_24.png
deleted file mode 100644
index 3171a5f6af9..00000000000
Binary files a/src/plugins/debugger/images/breakpoint_disabled_24.png and /dev/null differ
diff --git a/src/plugins/debugger/images/breakpoint_disabled_32.png b/src/plugins/debugger/images/breakpoint_disabled_32.png
deleted file mode 100644
index 432476e6612..00000000000
Binary files a/src/plugins/debugger/images/breakpoint_disabled_32.png and /dev/null differ
diff --git a/src/plugins/debugger/images/breakpoint_pending.svg b/src/plugins/debugger/images/breakpoint_pending.svg
deleted file mode 100644
index e7094068b53..00000000000
--- a/src/plugins/debugger/images/breakpoint_pending.svg
+++ /dev/null
@@ -1,534 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="14"
-   height="14"
-   id="svg2270"
-   sodipodi:version="0.32"
-   inkscape:version="0.45.1"
-   version="1.0"
-   sodipodi:docbase="c:\depot\research\main\editor\images"
-   sodipodi:docname="pendingbreakpoint.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs2272">
-    <linearGradient
-       id="linearGradient7029">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop7031" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop7033" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient17794">
-      <stop
-         style="stop-color:#f18383;stop-opacity:1;"
-         offset="0"
-         id="stop17798" />
-      <stop
-         id="stop8006"
-         offset="0.3807947"
-         style="stop-color:#ed6767;stop-opacity:1;" />
-      <stop
-         style="stop-color:#e62323;stop-opacity:1;"
-         offset="1"
-         id="stop17796" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient17794"
-       id="linearGradient24732"
-       gradientUnits="userSpaceOnUse"
-       x1="472.42236"
-       y1="436.79602"
-       x2="461.39169"
-       y2="424.95065" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient17794"
-       id="linearGradient2438"
-       gradientUnits="userSpaceOnUse"
-       x1="472.42236"
-       y1="436.79602"
-       x2="461.39169"
-       y2="424.95065" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient17794"
-       id="radialGradient6052"
-       cx="466.73566"
-       cy="431.19708"
-       fx="466.73566"
-       fy="431.19708"
-       r="9.3095722"
-       gradientTransform="matrix(1,0,0,1.0057859,0,-2.4948735)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient7029"
-       id="linearGradient7035"
-       x1="6.75"
-       y1="0.5"
-       x2="6.75"
-       y2="12.5"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       y2="12.5"
-       x2="6.75"
-       y1="0.5"
-       x1="6.75"
-       id="linearGradient2228"
-       xlink:href="#linearGradient7029"
-       inkscape:collect="always" />
-    <radialGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,1.0057859,0,-2.4948735)"
-       r="9.3095722"
-       fy="431.19708"
-       fx="466.73566"
-       cy="431.19708"
-       cx="466.73566"
-       id="radialGradient2226"
-       xlink:href="#linearGradient17794"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="424.95065"
-       x2="461.39169"
-       y1="436.79602"
-       x1="472.42236"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient2224"
-       xlink:href="#linearGradient17794"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="424.95065"
-       x2="461.39169"
-       y1="436.79602"
-       x1="472.42236"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient2222"
-       xlink:href="#linearGradient17794"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient2214">
-      <stop
-         id="stop2216"
-         offset="0"
-         style="stop-color:#f18383;stop-opacity:1;" />
-      <stop
-         style="stop-color:#ed6767;stop-opacity:1;"
-         offset="0.3807947"
-         id="stop2218" />
-      <stop
-         id="stop2220"
-         offset="1"
-         style="stop-color:#e62323;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient2208">
-      <stop
-         id="stop2210"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         id="stop2212"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       gradientTransform="matrix(1.2661544,0,0,1.2608351,469.23729,510.59508)"
-       y2="10.60876"
-       x2="10.981011"
-       y1="9.9135647"
-       x1="10.946278"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4173"
-       xlink:href="#linearGradient4128"
-       inkscape:collect="always" />
-    <linearGradient
-       gradientTransform="matrix(1.2608351,0,0,1.2608351,475.7834,516.59183)"
-       y2="9.578125"
-       x2="5.859375"
-       y1="6.609375"
-       x1="5.953125"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4159"
-       xlink:href="#linearGradient4128"
-       inkscape:collect="always" />
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       y2="11"
-       x2="11"
-       y1="10"
-       x1="11"
-       id="linearGradient4156"
-       xlink:href="#linearGradient4128"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="521.00476"
-       x2="472.35138"
-       y1="519.11353"
-       x1="472.35138"
-       gradientTransform="matrix(1,0,0,1.0000093,10.421461,10.71221)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4138"
-       xlink:href="#linearGradient4128"
-       inkscape:collect="always" />
-    <linearGradient
-       gradientTransform="matrix(1,0,0,0.9687523,10.283691,16.9106)"
-       gradientUnits="userSpaceOnUse"
-       y2="521.00476"
-       x2="472.35138"
-       y1="519.11353"
-       x1="472.35138"
-       id="linearGradient4134"
-       xlink:href="#linearGradient4128"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="424.95065"
-       x2="461.39169"
-       y1="436.79602"
-       x1="472.42236"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient2293"
-       xlink:href="#linearGradient17794"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="424.95065"
-       x2="461.39169"
-       y1="436.79602"
-       x1="472.42236"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient2291"
-       xlink:href="#linearGradient17794"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient2285">
-      <stop
-         id="stop2287"
-         offset="0"
-         style="stop-color:#c80000;stop-opacity:1;" />
-      <stop
-         id="stop2289"
-         offset="1"
-         style="stop-color:#ffa0a0;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       y2="424.95065"
-       x2="461.39169"
-       y1="436.79602"
-       x1="472.42236"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient25826"
-       xlink:href="#linearGradient17794"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient4128">
-      <stop
-         id="stop4130"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.78431374;" />
-      <stop
-         id="stop4132"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0.23529412;" />
-    </linearGradient>
-    <linearGradient
-       gradientTransform="matrix(1.2661544,0,0,1.2608351,469.23729,510.59508)"
-       y2="10.60876"
-       x2="10.981011"
-       y1="9.9135647"
-       x1="10.946278"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient2378"
-       xlink:href="#linearGradient4128"
-       inkscape:collect="always" />
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       y2="11.147234"
-       x2="11.02502"
-       y1="9.6892195"
-       x1="10.968282"
-       id="linearGradient2376"
-       xlink:href="#linearGradient4128"
-       inkscape:collect="always" />
-    <linearGradient
-       gradientTransform="matrix(1.2608351,0,0,1.2608351,475.7834,516.59183)"
-       y2="9.578125"
-       x2="5.859375"
-       y1="6.609375"
-       x1="5.953125"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient2374"
-       xlink:href="#linearGradient4128"
-       inkscape:collect="always" />
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       y2="11"
-       x2="11"
-       y1="10"
-       x1="11"
-       id="linearGradient2372"
-       xlink:href="#linearGradient4128"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="521.00476"
-       x2="472.35138"
-       y1="519.11353"
-       x1="472.35138"
-       gradientTransform="matrix(1,0,0,0.6666648,10.303108,184.09099)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient2370"
-       xlink:href="#linearGradient4128"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="521.00476"
-       x2="472.35138"
-       y1="519.11353"
-       x1="472.35138"
-       gradientTransform="matrix(1,0,0,0.6666648,10.342666,173.98441)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient2368"
-       xlink:href="#linearGradient4128"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="521.00476"
-       x2="472.35138"
-       y1="519.11353"
-       x1="472.35138"
-       gradientTransform="matrix(1,0,0,1.0000093,10.421461,10.71221)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient2366"
-       xlink:href="#linearGradient4128"
-       inkscape:collect="always" />
-    <linearGradient
-       gradientTransform="matrix(1,0,0,0.9687523,10.283691,16.9106)"
-       gradientUnits="userSpaceOnUse"
-       y2="521.00476"
-       x2="472.35138"
-       y1="519.11353"
-       x1="472.35138"
-       id="linearGradient2364"
-       xlink:href="#linearGradient4128"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="424.95065"
-       x2="461.39169"
-       y1="436.79602"
-       x1="472.42236"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient2362"
-       xlink:href="#linearGradient17794"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="424.95065"
-       x2="461.39169"
-       y1="436.79602"
-       x1="472.42236"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient2360"
-       xlink:href="#linearGradient17794"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient2354">
-      <stop
-         id="stop2356"
-         offset="0"
-         style="stop-color:#c80000;stop-opacity:1;" />
-      <stop
-         id="stop2358"
-         offset="1"
-         style="stop-color:#ffa0a0;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       y2="424.95065"
-       x2="461.39169"
-       y1="436.79602"
-       x1="472.42236"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient2352"
-       xlink:href="#linearGradient17794"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient2346">
-      <stop
-         id="stop2348"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.78431374;" />
-      <stop
-         id="stop2350"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0.23529412;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4128"
-       id="linearGradient2392"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6666648,10.342666,173.98441)"
-       x1="472.35138"
-       y1="519.11353"
-       x2="472.35138"
-       y2="521.00476" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4128"
-       id="linearGradient2394"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6666648,10.303108,184.09099)"
-       x1="472.35138"
-       y1="519.11353"
-       x2="472.35138"
-       y2="521.00476" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4128"
-       id="linearGradient2396"
-       gradientUnits="userSpaceOnUse"
-       x1="10.968282"
-       y1="9.6892195"
-       x2="11.02502"
-       y2="11.147234" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     gridtolerance="10000"
-     guidetolerance="10"
-     objecttolerance="10"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="45.254834"
-     inkscape:cx="13.678175"
-     inkscape:cy="6.8291478"
-     inkscape:document-units="px"
-     inkscape:current-layer="g25843"
-     width="14px"
-     height="14px"
-     inkscape:window-width="1280"
-     inkscape:window-height="998"
-     inkscape:window-x="44"
-     inkscape:window-y="58"
-     showgrid="true"
-     gridspacingx="0.5px"
-     gridspacingy="0.5px"
-     gridempspacing="2"
-     inkscape:grid-points="true" />
-  <metadata
-     id="metadata2275">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <g
-       id="g25843"
-       transform="matrix(0.7931251,0,0,0.7931251,-372.13374,-408.22195)">
-      <path
-         sodipodi:type="arc"
-         style="fill:url(#radialGradient6052);fill-opacity:1.0;stroke:#c80000;stroke-width:1.43637741;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         id="path22737"
-         sodipodi:cx="466.73566"
-         sodipodi:cy="431.19708"
-         sodipodi:rx="8.5913839"
-         sodipodi:ry="8.6452484"
-         d="M 475.32704 431.19708 A 8.5913839 8.6452484 0 1 1  458.14427,431.19708 A 8.5913839 8.6452484 0 1 1  475.32704 431.19708 z"
-         transform="matrix(0.8805346,0,0,0.8750503,66.41784,145.57686)" />
-      <path
-         sodipodi:type="arc"
-         style="opacity:1;fill:url(#linearGradient7035);fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         id="path6058"
-         sodipodi:cx="6.75"
-         sodipodi:cy="6.5"
-         sodipodi:rx="5.75"
-         sodipodi:ry="6"
-         d="M 12.5 6.5 A 5.75 6 0 1 1  1,6.5 A 5.75 6 0 1 1  12.5 6.5 z"
-         transform="matrix(0.9867408,0,0,0.6304178,470.73423,515.01579)" />
-      <g
-         id="g2380"
-         inkscape:label="Layer 1"
-         transform="matrix(1.2608365,0,0,1.2633098,469.19929,514.69071)">
-        <g
-           transform="matrix(0.7931251,0,0,0.7931251,-372.13374,-408.22195)"
-           id="g2382">
-          <path
-             style="fill:#7f7f8c;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-             d="M 481.17723,524.15684 C 481.17723,524.15684 482.11277,524.68766 483.0584,524.68766 C 484.00403,524.68766 484.95974,524.15684 484.95974,524.15684 L 483.4493,526.03249 L 483.4493,527.83201 L 484.8944,528.56151 L 484.95974,531.09144 L 481.17723,531.09144 L 481.16963,528.69627 L 482.71594,527.80266 L 482.72456,526.04216 L 481.17723,524.15684 z "
-             id="path2442"
-             sodipodi:nodetypes="czcccccccccc" />
-          <path
-             style="opacity:0.2;fill:#7f7f7f;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-             d="M 481.17723,521.00476 L 481.17723,523.52643 L 482.43807,526.0481 L 481.17723,528.56977 L 481.17723,531.72186 L 484.95974,531.72186 L 484.95974,528.56977 L 483.6989,526.0481 L 484.95974,523.52643 L 484.95974,521.00476 L 481.17723,521.00476 z "
-             id="path2444"
-             sodipodi:nodetypes="ccccccccccc" />
-          <path
-             sodipodi:nodetypes="cccccccccccccccccccccc"
-             id="path2174"
-             d="M 480.54682,520.37434 L 480.54681,523.52643 L 481.80765,526.0481 L 480.54681,528.56977 L 480.54682,531.72185 L 485.59016,531.72185 L 485.59015,528.56977 L 484.32932,526.0481 L 485.59015,523.52643 L 485.59016,520.37434 L 480.54682,520.37434 z M 481.80766,521.63517 L 484.32932,521.63517 L 484.32932,523.52643 L 483.46249,526.0481 L 484.32932,528.56977 L 484.32932,530.46102 L 481.80766,530.46102 L 481.80765,528.56977 L 482.72372,526.0481 L 481.80765,523.52643 L 481.80766,521.63517 z "
-             style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-          <rect
-             ry="1.2608351"
-             y="519.7439"
-             x="479.28598"
-             height="2.5216701"
-             width="7.565001"
-             id="rect2172"
-             style="opacity:1;fill:#7f2aff;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-          <rect
-             ry="1.2608351"
-             y="529.83063"
-             x="479.28598"
-             height="2.5216701"
-             width="7.565001"
-             id="rect2170"
-             style="opacity:1;fill:#6600ff;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-          <rect
-             ry="0.63040882"
-             y="520.0589"
-             x="480.17267"
-             height="1.2608176"
-             width="5.6737618"
-             id="rect4140"
-             style="opacity:1;fill:url(#linearGradient2392);fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-          <rect
-             ry="0.63040882"
-             y="530.16577"
-             x="480.13324"
-             height="1.2608176"
-             width="5.6737618"
-             id="rect4144"
-             style="opacity:1;fill:url(#linearGradient2394);fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-          <path
-             sodipodi:nodetypes="cssz"
-             transform="matrix(1.2608351,0,0,1.2608351,469.1993,514.70058)"
-             id="path4161"
-             d="M 11.007811,9.9179701 C 10.386665,9.9257826 9.6414144,10.484263 9.5594939,10.992187 C 9.5017174,11.350414 12.494284,11.43273 12.441847,10.914063 C 12.40754,10.574731 11.628908,9.9101582 11.007811,9.9179701 z "
-             style="fill:url(#linearGradient2396);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-        </g>
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/src/plugins/debugger/images/breakpoint_pending_16.png b/src/plugins/debugger/images/breakpoint_pending_16.png
deleted file mode 100644
index cadd69febd0..00000000000
Binary files a/src/plugins/debugger/images/breakpoint_pending_16.png and /dev/null differ
diff --git a/src/plugins/debugger/images/breakpoint_pending_24.png b/src/plugins/debugger/images/breakpoint_pending_24.png
deleted file mode 100644
index 3549e0ac292..00000000000
Binary files a/src/plugins/debugger/images/breakpoint_pending_24.png and /dev/null differ
diff --git a/src/plugins/debugger/images/breakpoint_pending_overlay.png b/src/plugins/debugger/images/breakpoint_pending_overlay.png
new file mode 100644
index 00000000000..0bb7faa81ab
Binary files /dev/null and b/src/plugins/debugger/images/breakpoint_pending_overlay.png differ
diff --git a/src/plugins/debugger/images/breakpoint_pending_overlay@2x.png b/src/plugins/debugger/images/breakpoint_pending_overlay@2x.png
new file mode 100644
index 00000000000..fb9cffc7902
Binary files /dev/null and b/src/plugins/debugger/images/breakpoint_pending_overlay@2x.png differ
diff --git a/src/plugins/debugger/images/debugger_reversemode.png b/src/plugins/debugger/images/debugger_reversemode.png
new file mode 100644
index 00000000000..eec3daede44
Binary files /dev/null and b/src/plugins/debugger/images/debugger_reversemode.png differ
diff --git a/src/plugins/debugger/images/debugger_reversemode.svg b/src/plugins/debugger/images/debugger_reversemode.svg
deleted file mode 100644
index 5f492bccdb6..00000000000
--- a/src/plugins/debugger/images/debugger_reversemode.svg
+++ /dev/null
@@ -1,174 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   sodipodi:docname="reverse.svg"
-   version="1.0"
-   inkscape:version="0.47pre4 r22446"
-   sodipodi:version="0.32"
-   id="svg2243"
-   height="14"
-   width="14">
-  <defs
-     id="defs2245">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 7 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="14 : 7 : 1"
-       inkscape:persp3d-origin="7 : 4.6666667 : 1"
-       id="perspective18" />
-    <linearGradient
-       id="linearGradient3134">
-      <stop
-         style="stop-color:#dcdc23;stop-opacity:1;"
-         offset="0"
-         id="stop3136" />
-      <stop
-         id="stop5080"
-         offset="0.64285713"
-         style="stop-color:#e5d044;stop-opacity:1;" />
-      <stop
-         style="stop-color:#b89354;stop-opacity:1;"
-         offset="1"
-         id="stop3138" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3137">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.86274511;"
-         offset="0"
-         id="stop3139" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop3141" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3137"
-       id="linearGradient3143"
-       x1="6.5"
-       y1="3"
-       x2="6.515625"
-       y2="12.180227"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.88,0,0,-0.66666667,12.72,12.666667)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3134"
-       id="linearGradient3140"
-       x1="6.5"
-       y1="3.015625"
-       x2="6.484375"
-       y2="11.984375"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,-1,14,15)" />
-    <filter
-       id="filter6985"
-       inkscape:label="Moonarize"
-       inkscape:menu="Color"
-       inkscape:menu-tooltip="An effect between solarize and invert which often preserves sky and water lights"
-       y="0"
-       x="0"
-       height="1"
-       width="1"
-       color-interpolation-filters="sRGB">
-      <feColorMatrix
-         id="feColorMatrix6987"
-         type="hueRotate"
-         values="180"
-         result="fbSourceGraphic" />
-      <feColorMatrix
-         id="feColorMatrix6989"
-         in="fbSourceGraphic"
-         values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0 "
-         result="result3" />
-      <feBlend
-         id="feBlend6991"
-         in2="result3"
-         mode="lighten"
-         in="fbSourceGraphic"
-         result="result2" />
-      <feBlend
-         id="feBlend6993"
-         in2="result2"
-         mode="multiply"
-         result="result1"
-         in="result2" />
-      <feComposite
-         id="feComposite6995"
-         in2="SourceGraphic"
-         operator="in" />
-    </filter>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     gridtolerance="10000"
-     guidetolerance="10"
-     objecttolerance="10"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="64"
-     inkscape:cx="8.3920091"
-     inkscape:cy="7.4257237"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     width="14px"
-     height="14px"
-     showborder="true"
-     inkscape:window-width="1600"
-     inkscape:window-height="1174"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     showgrid="true"
-     inkscape:grid-points="true"
-     inkscape:window-maximized="0">
-    <inkscape:grid
-       id="GridFromPre046Settings"
-       type="xygrid"
-       originx="0px"
-       originy="0px"
-       spacingx="0.5px"
-       spacingy="0.5px"
-       color="#0000ff"
-       empcolor="#0000ff"
-       opacity="0.2"
-       empopacity="0.4"
-       empspacing="2" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata2248">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <path
-       style="fill:url(#linearGradient3140);fill-opacity:1;fill-rule:evenodd;stroke:#b18b1b;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;filter:url(#filter6985)"
-       d="m 7.5,12 0,-2.5 6,0 0,-4 -6,0 L 7.5,3 0.875,7.5 7.5,12 z"
-       id="path2216"
-       sodipodi:nodetypes="cccccccc" />
-  </g>
-</svg>
diff --git a/src/plugins/debugger/images/debugger_reversemode@2x.png b/src/plugins/debugger/images/debugger_reversemode@2x.png
new file mode 100644
index 00000000000..9c8b2ff75eb
Binary files /dev/null and b/src/plugins/debugger/images/debugger_reversemode@2x.png differ
diff --git a/src/plugins/debugger/images/debugger_reversemode_16.png b/src/plugins/debugger/images/debugger_reversemode_16.png
deleted file mode 100644
index 784914515d7..00000000000
Binary files a/src/plugins/debugger/images/debugger_reversemode_16.png and /dev/null differ
diff --git a/src/plugins/debugger/images/debugger_reversemode_background.png b/src/plugins/debugger/images/debugger_reversemode_background.png
new file mode 100644
index 00000000000..dc2e9eed211
Binary files /dev/null and b/src/plugins/debugger/images/debugger_reversemode_background.png differ
diff --git a/src/plugins/debugger/images/debugger_reversemode_background@2x.png b/src/plugins/debugger/images/debugger_reversemode_background@2x.png
new file mode 100644
index 00000000000..1c1903a5f64
Binary files /dev/null and b/src/plugins/debugger/images/debugger_reversemode_background@2x.png differ
diff --git a/src/plugins/debugger/images/debugger_snapshot_small.png b/src/plugins/debugger/images/debugger_snapshot_small.png
deleted file mode 100644
index 071451e2c60..00000000000
Binary files a/src/plugins/debugger/images/debugger_snapshot_small.png and /dev/null differ
diff --git a/src/plugins/debugger/images/debugger_steponeproc_small.png b/src/plugins/debugger/images/debugger_steponeproc_small.png
deleted file mode 100644
index cf164c66047..00000000000
Binary files a/src/plugins/debugger/images/debugger_steponeproc_small.png and /dev/null differ
diff --git a/src/plugins/debugger/images/debugger_stepoverproc_small.png b/src/plugins/debugger/images/debugger_stepoverproc_small.png
deleted file mode 100644
index 34e712da06e..00000000000
Binary files a/src/plugins/debugger/images/debugger_stepoverproc_small.png and /dev/null differ
diff --git a/src/plugins/debugger/images/location.png b/src/plugins/debugger/images/location.png
new file mode 100644
index 00000000000..023de4fb188
Binary files /dev/null and b/src/plugins/debugger/images/location.png differ
diff --git a/src/plugins/debugger/images/location.svg b/src/plugins/debugger/images/location.svg
deleted file mode 100644
index afb70052a14..00000000000
--- a/src/plugins/debugger/images/location.svg
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="14"
-   height="14"
-   id="svg2243"
-   sodipodi:version="0.32"
-   inkscape:version="0.45.1"
-   version="1.0"
-   sodipodi:docbase="c:\depot\research\main\editor\images"
-   sodipodi:docname="location.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs2245">
-    <linearGradient
-       id="linearGradient3134">
-      <stop
-         style="stop-color:#dcdc23;stop-opacity:1;"
-         offset="0"
-         id="stop3136" />
-      <stop
-         id="stop5080"
-         offset="0.64285713"
-         style="stop-color:#e5d044;stop-opacity:1;" />
-      <stop
-         style="stop-color:#b89354;stop-opacity:1;"
-         offset="1"
-         id="stop3138" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3137">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.86274511;"
-         offset="0"
-         id="stop3139" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop3141" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3137"
-       id="linearGradient3143"
-       x1="6.5"
-       y1="3"
-       x2="6.515625"
-       y2="12.180227"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3134"
-       id="linearGradient3140"
-       x1="6.5"
-       y1="3.015625"
-       x2="6.484375"
-       y2="11.984375"
-       gradientUnits="userSpaceOnUse" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     gridtolerance="10000"
-     guidetolerance="10"
-     objecttolerance="10"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="64"
-     inkscape:cx="8.3920091"
-     inkscape:cy="7.4257237"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     width="14px"
-     height="14px"
-     showborder="true"
-     inkscape:window-width="1600"
-     inkscape:window-height="1174"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     gridempspacing="2"
-     showgrid="true"
-     inkscape:grid-points="true"
-     gridspacingx="0.5px"
-     gridspacingy="0.5px" />
-  <metadata
-     id="metadata2248">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <path
-       style="fill:url(#linearGradient3140);fill-opacity:1.0;fill-rule:evenodd;stroke:#b18b1b;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 6.5,3 L 6.5,5.5 L 0.5,5.5 L 0.5,9.5 L 6.5,9.5 L 6.5,12 L 13.125,7.5 L 6.5,3 z "
-       id="path2216"
-       sodipodi:nodetypes="cccccccc" />
-    <path
-       style="fill:url(#linearGradient3143);fill-opacity:1.0;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;opacity:1"
-       d="M 6.5,3 L 6.5,5.5 L 0.5,5.5 L 0.5,7.5 C 7,6.5 7.5,9.5 13,7.5 L 6.5,3 z "
-       id="path5066"
-       sodipodi:nodetypes="cccccc" />
-  </g>
-</svg>
diff --git a/src/plugins/debugger/images/location@2x.png b/src/plugins/debugger/images/location@2x.png
new file mode 100644
index 00000000000..fd08adc79f4
Binary files /dev/null and b/src/plugins/debugger/images/location@2x.png differ
diff --git a/src/plugins/debugger/images/location_16.png b/src/plugins/debugger/images/location_16.png
deleted file mode 100644
index 6b5986a291e..00000000000
Binary files a/src/plugins/debugger/images/location_16.png and /dev/null differ
diff --git a/src/plugins/debugger/images/location_24.png b/src/plugins/debugger/images/location_24.png
deleted file mode 100644
index 3066cd2da15..00000000000
Binary files a/src/plugins/debugger/images/location_24.png and /dev/null differ
diff --git a/src/plugins/debugger/images/location_background.png b/src/plugins/debugger/images/location_background.png
new file mode 100644
index 00000000000..1adab1199fa
Binary files /dev/null and b/src/plugins/debugger/images/location_background.png differ
diff --git a/src/plugins/debugger/images/location_background@2x.png b/src/plugins/debugger/images/location_background@2x.png
new file mode 100644
index 00000000000..95e21455c89
Binary files /dev/null and b/src/plugins/debugger/images/location_background@2x.png differ
diff --git a/src/plugins/debugger/images/qml/apply-on-save.png b/src/plugins/debugger/images/qml/apply-on-save.png
deleted file mode 100644
index 19e75ab66d0..00000000000
Binary files a/src/plugins/debugger/images/qml/apply-on-save.png and /dev/null differ
diff --git a/src/tools/icons/qtcreatoricons.svg b/src/tools/icons/qtcreatoricons.svg
index 97867993554..0a080095b1a 100644
--- a/src/tools/icons/qtcreatoricons.svg
+++ b/src/tools/icons/qtcreatoricons.svg
@@ -4151,6 +4151,130 @@
          inkscape:connector-curvature="0"
          sodipodi:nodetypes="cccccccc" />
     </g>
+    <g
+       id="src/plugins/debugger/images/breakpoint"
+       transform="translate(-422,-48)">
+      <rect
+         y="584"
+         x="486"
+         height="16"
+         width="16"
+         id="rect4024-7-4"
+         style="fill:#ffffff;stroke:none" />
+      <path
+         id="path5294-7-1"
+         d="m 494,586 c -3.314,0 -6,2.686 -6,6 0,3.314 2.686,6 6,6 3.314,0 6,-2.686 6,-6 0,-3.314 -2.686,-6 -6,-6 z"
+         inkscape:connector-curvature="0"
+         style="display:inline;fill:#000000"
+         sodipodi:nodetypes="sssss" />
+    </g>
+    <g
+       style="display:inline"
+       id="src/plugins/debugger/images/breakpoint_pending_overlay"
+       transform="translate(-374,-48)">
+      <rect
+         y="584"
+         x="486"
+         height="16"
+         width="16"
+         id="rect4024-7-4-0"
+         style="fill:#ffffff;stroke:none" />
+      <path
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 495,590 0,1 1,0 0,2.5 1,1 -1,1 0,2.5 -1,0 0,1 6,0 0,-1 -1,0 0,-2.5 -1,-1 1,-1 0,-2.5 1,0 0,-1 z"
+         id="path4732"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccccccccccccccccccc" />
+      <path
+         style="fill:#cccccc;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 497,591 2,0 0,2.5 -1,1 -1,-1 z"
+         id="path4862"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cccccc" />
+      <use
+         x="0"
+         y="0"
+         xlink:href="#path4862"
+         id="use4866"
+         transform="matrix(1,0,0,-1,0,1189)"
+         width="100%"
+         height="100%" />
+    </g>
+    <g
+       style="display:inline"
+       id="src/plugins/debugger/images/breakpoint_disabled"
+       transform="translate(-358,-48)">
+      <rect
+         y="584"
+         x="486"
+         height="16"
+         width="16"
+         id="rect4024-7-4-9"
+         style="fill:#ffffff;stroke:none" />
+      <use
+         x="0"
+         y="0"
+         xlink:href="#path5294-7-1"
+         id="use4834"
+         width="100%"
+         height="100%" />
+      <circle
+         style="opacity:1;fill:#cccccc;fill-opacity:1;stroke:none;stroke-opacity:1"
+         id="path4838"
+         cx="494"
+         cy="592"
+         r="5" />
+    </g>
+    <g
+       id="src/plugins/debugger/images/location">
+      <rect
+         y="536"
+         x="144"
+         height="16"
+         width="16"
+         id="rect4024-7-4-9-6"
+         style="fill:#ffffff;stroke:none" />
+      <path
+         sodipodi:nodetypes="cccccccc"
+         inkscape:connector-curvature="0"
+         id="path4833"
+         d="m 145.5,542.5 6,0 0,-3 7,4.5 -7,4.5 0,-3 -6,0 z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    </g>
+    <g
+       transform="translate(16,0)"
+       style="display:inline"
+       id="src/plugins/debugger/images/location_background">
+      <rect
+         y="536"
+         x="144"
+         height="16"
+         width="16"
+         id="rect4024-7-4-9-6-0"
+         style="fill:#ffffff;stroke:none" />
+      <path
+         sodipodi:nodetypes="cccccccc"
+         inkscape:connector-curvature="0"
+         id="path4833-0"
+         d="m 145.5,542.5 6,0 0,-3 7,4.5 -7,4.5 0,-3 -6,0 z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;opacity:1" />
+    </g>
+    <use
+       x="0"
+       y="0"
+       xlink:href="#src/plugins/debugger/images/location"
+       id="src/plugins/debugger/images/debugger_reversemode"
+       transform="matrix(-1,0,0,1,336,0)"
+       width="100%"
+       height="100%" />
+    <use
+       x="0"
+       y="0"
+       xlink:href="#src/plugins/debugger/images/location_background"
+       id="src/plugins/debugger/images/debugger_reversemode_background"
+       transform="matrix(-1,0,0,1,368,0)"
+       width="100%"
+       height="100%" />
   </g>
   <g
      inkscape:groupmode="layer"