diff --git a/src/plugins/coreplugin/core.qrc b/src/plugins/coreplugin/core.qrc
index a2c3b8ee4b4..a8c2c0a76c9 100644
--- a/src/plugins/coreplugin/core.qrc
+++ b/src/plugins/coreplugin/core.qrc
@@ -40,7 +40,10 @@
         <file>images/plus.png</file>
         <file>images/plus@2x.png</file>
         <file>images/redo.png</file>
-        <file>images/replace.png</file>
+        <file>images/replace_a.png</file>
+        <file>images/replace_a@2x.png</file>
+        <file>images/replace_b.png</file>
+        <file>images/replace_b@2x.png</file>
         <file>images/reset.png</file>
         <file>images/sidebaricon.png</file>
         <file>images/sidebaricon@2x.png</file>
diff --git a/src/plugins/coreplugin/coreicons.cpp b/src/plugins/coreplugin/coreicons.cpp
index 56fea1b9930..213492bcb04 100644
--- a/src/plugins/coreplugin/coreicons.cpp
+++ b/src/plugins/coreplugin/coreicons.cpp
@@ -152,6 +152,9 @@ const Icon EYE_OPEN_TOOLBAR({
         {QLatin1String(":/core/images/eye_open.png"), Theme::IconsBaseColor}});
 const Icon EYE_CLOSED_TOOLBAR({
         {QLatin1String(":/core/images/eye_closed.png"), Theme::IconsBaseColor}});
+const Icon REPLACE({
+        {QLatin1String(":/core/images/replace_a.png"), Theme::PanelTextColorMid},
+        {QLatin1String(":/core/images/replace_b.png"), Theme::IconsInfoColor}}, Icon::Tint);
 
 const Icon MODE_EDIT_CLASSIC(
         QLatin1String(":/fancyactionbar/images/mode_Edit.png"));
diff --git a/src/plugins/coreplugin/coreicons.h b/src/plugins/coreplugin/coreicons.h
index dbf956e123c..c2837cb8ec6 100644
--- a/src/plugins/coreplugin/coreicons.h
+++ b/src/plugins/coreplugin/coreicons.h
@@ -92,6 +92,7 @@ CORE_EXPORT extern const Utils::Icon INTERRUPT_SMALL_TOOLBAR;
 CORE_EXPORT extern const Utils::Icon BOUNDING_RECT;
 CORE_EXPORT extern const Utils::Icon EYE_OPEN_TOOLBAR;
 CORE_EXPORT extern const Utils::Icon EYE_CLOSED_TOOLBAR;
+CORE_EXPORT extern const Utils::Icon REPLACE;
 
 CORE_EXPORT extern const Utils::Icon MODE_EDIT_CLASSIC;
 CORE_EXPORT extern const Utils::Icon MODE_EDIT_FLAT;
diff --git a/src/plugins/coreplugin/images/replace.png b/src/plugins/coreplugin/images/replace.png
deleted file mode 100644
index baa05997bc3..00000000000
Binary files a/src/plugins/coreplugin/images/replace.png and /dev/null differ
diff --git a/src/plugins/coreplugin/images/replace_a.png b/src/plugins/coreplugin/images/replace_a.png
new file mode 100644
index 00000000000..447db902d84
Binary files /dev/null and b/src/plugins/coreplugin/images/replace_a.png differ
diff --git a/src/plugins/coreplugin/images/replace_a@2x.png b/src/plugins/coreplugin/images/replace_a@2x.png
new file mode 100644
index 00000000000..e33d41d0362
Binary files /dev/null and b/src/plugins/coreplugin/images/replace_a@2x.png differ
diff --git a/src/plugins/coreplugin/images/replace_b.png b/src/plugins/coreplugin/images/replace_b.png
new file mode 100644
index 00000000000..1088567fa02
Binary files /dev/null and b/src/plugins/coreplugin/images/replace_b.png differ
diff --git a/src/plugins/coreplugin/images/replace_b@2x.png b/src/plugins/coreplugin/images/replace_b@2x.png
new file mode 100644
index 00000000000..55751aa8dd2
Binary files /dev/null and b/src/plugins/coreplugin/images/replace_b@2x.png differ
diff --git a/src/plugins/coreplugin/variablechooser.cpp b/src/plugins/coreplugin/variablechooser.cpp
index bf58630a613..6ffe92cbd55 100644
--- a/src/plugins/coreplugin/variablechooser.cpp
+++ b/src/plugins/coreplugin/variablechooser.cpp
@@ -26,6 +26,8 @@
 #include "variablechooser.h"
 #include "coreconstants.h"
 
+#include <coreplugin/coreicons.h>
+
 #include <utils/fancylineedit.h> // IconButton
 #include <utils/headerviewstretcher.h> // IconButton
 #include <utils/macroexpander.h>
@@ -87,7 +89,7 @@ public:
     void createIconButton()
     {
         m_iconButton = new IconButton;
-        m_iconButton->setPixmap(QPixmap(QLatin1String(":/core/images/replace.png")));
+        m_iconButton->setPixmap(Core::Icons::REPLACE.pixmap());
         m_iconButton->setToolTip(VariableChooser::tr("Insert Variable"));
         m_iconButton->hide();
         connect(m_iconButton.data(), static_cast<void(QAbstractButton::*)(bool)>(&QAbstractButton::clicked),
diff --git a/src/tools/icons/qtcreatoricons.svg b/src/tools/icons/qtcreatoricons.svg
index 60fd6b64483..91940b62aad 100644
--- a/src/tools/icons/qtcreatoricons.svg
+++ b/src/tools/icons/qtcreatoricons.svg
@@ -3354,6 +3354,52 @@
            style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.29999995;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
       </g>
     </g>
+    <g
+       id="src/plugins/coreplugin/images/replace_a">
+      <rect
+         id="rect6782-96-0-04"
+         height="16"
+         width="16"
+         y="568"
+         x="1064"
+         style="display:inline;fill:#ffffff;fill-opacity:1" />
+      <path
+         inkscape:connector-curvature="0"
+         d="m 1067.5,576 0,-4.9375 c 0,0 0.5,-1.5625 2,-1.5625 1.5,0 2,1.5625 2,1.5625 l 0,4.9375 m -4,-2.5 4,0"
+         style="display:inline;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1"
+         id="path6077"
+         sodipodi:nodetypes="ccscccc" />
+    </g>
+    <g
+       style="display:inline"
+       id="src/plugins/coreplugin/images/replace_b"
+       transform="translate(16,0)">
+      <rect
+         id="rect6782-96-0-04-0"
+         height="16"
+         width="16"
+         y="568"
+         x="1064"
+         style="display:inline;fill:#ffffff;fill-opacity:1" />
+      <path
+         inkscape:connector-curvature="0"
+         d="m 1074.5,579.5 2.3437,0 c 0,0 1.6563,0 1.6563,1.5 0,1.5 -1.6563,1.5 -1.6563,1.5 l -2.3437,0 0,-6 2.3437,0 c 0,0 1.6563,0 1.6563,1.5 0,1.5 -1.6563,1.5 -1.6563,1.5"
+         style="display:inline;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1"
+         id="path6081-2"
+         sodipodi:nodetypes="ccsccccsc" />
+      <path
+         sodipodi:nodetypes="csc"
+         inkscape:connector-curvature="0"
+         id="path4755-9-7"
+         d="M 1066.6326,576.26777 C 1065,578 1065.2737,579.25716 1066.0575,579.82141 1067,580.5 1067.5,580.5 1071.9063,580.39959"
+         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cccc"
+         inkscape:connector-curvature="0"
+         id="path4757-4-2"
+         d="m 1070,583.5 3,-3 -3,-3 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>
   <g
      inkscape:groupmode="layer"