diff --git a/src/plugins/texteditor/images/lightbulb.png b/src/plugins/texteditor/images/lightbulb.png
new file mode 100644
index 00000000000..3f2e904000d
Binary files /dev/null and b/src/plugins/texteditor/images/lightbulb.png differ
diff --git a/src/plugins/texteditor/images/lightbulb@2x.png b/src/plugins/texteditor/images/lightbulb@2x.png
new file mode 100644
index 00000000000..ec43d8f1c1f
Binary files /dev/null and b/src/plugins/texteditor/images/lightbulb@2x.png differ
diff --git a/src/plugins/texteditor/images/lightbulbcap.png b/src/plugins/texteditor/images/lightbulbcap.png
new file mode 100644
index 00000000000..f860c9c4080
Binary files /dev/null and b/src/plugins/texteditor/images/lightbulbcap.png differ
diff --git a/src/plugins/texteditor/images/lightbulbcap@2x.png b/src/plugins/texteditor/images/lightbulbcap@2x.png
new file mode 100644
index 00000000000..83cce03eed5
Binary files /dev/null and b/src/plugins/texteditor/images/lightbulbcap@2x.png differ
diff --git a/src/plugins/texteditor/images/refactormarker.png b/src/plugins/texteditor/images/refactormarker.png
deleted file mode 100644
index 65371d930b5..00000000000
Binary files a/src/plugins/texteditor/images/refactormarker.png and /dev/null differ
diff --git a/src/plugins/texteditor/refactoroverlay.cpp b/src/plugins/texteditor/refactoroverlay.cpp
index 1a68097cf06..cc7fd3cebf9 100644
--- a/src/plugins/texteditor/refactoroverlay.cpp
+++ b/src/plugins/texteditor/refactoroverlay.cpp
@@ -27,6 +27,8 @@
 #include "textdocumentlayout.h"
 #include "texteditor.h"
 
+#include <utils/icon.h>
+
 #include <QPainter>
 
 #include <QDebug>
@@ -37,7 +39,9 @@ RefactorOverlay::RefactorOverlay(TextEditor::TextEditorWidget *editor) :
     QObject(editor),
     m_editor(editor),
     m_maxWidth(0),
-    m_icon(QLatin1String(":/texteditor/images/refactormarker.png"))
+    m_icon(Utils::Icon({
+        {QLatin1String(":/texteditor/images/lightbulbcap.png"), Utils::Theme::PanelTextColorMid},
+        {QLatin1String(":/texteditor/images/lightbulb.png"), Utils::Theme::IconsWarningColor}}, Utils::Icon::Tint).icon())
 {
 }
 
diff --git a/src/plugins/texteditor/texteditor.qrc b/src/plugins/texteditor/texteditor.qrc
index 7f829e91594..286644c33a7 100644
--- a/src/plugins/texteditor/texteditor.qrc
+++ b/src/plugins/texteditor/texteditor.qrc
@@ -2,7 +2,10 @@
     <qresource prefix="/texteditor">
         <file>images/finddocuments.png</file>
         <file>images/finddirectory.png</file>
-        <file>images/refactormarker.png</file>
+        <file>images/lightbulb.png</file>
+        <file>images/lightbulb@2x.png</file>
+        <file>images/lightbulbcap.png</file>
+        <file>images/lightbulbcap@2x.png</file>
         <file>images/snippet.png</file>
     </qresource>
 </RCC>
diff --git a/src/tools/icons/qtcreatoricons.svg b/src/tools/icons/qtcreatoricons.svg
index e4149743035..a267532496e 100644
--- a/src/tools/icons/qtcreatoricons.svg
+++ b/src/tools/icons/qtcreatoricons.svg
@@ -3360,6 +3360,42 @@
          style="fill:#000000"
          id="rect5132-95" />
     </g>
+    <g
+       style="display:inline"
+       id="src/plugins/texteditor/images/lightbulbcap"
+       transform="translate(28,2)">
+      <rect
+         style="fill:#ffffff"
+         x="1180"
+         y="571"
+         width="10"
+         height="11"
+         id="rect6782-96-0-0-7-8-1-0-4-4" />
+      <path
+         style="fill:#000000"
+         d="m 1183,578.3334 0,0.6666 0.5,0 0,1 -0.5,0 0,1 1,0 0.5,1 1,0 0.5,-1 1,0 0,-1 -0.5,0 0,-1 0.5,0 0,-0.6666 z"
+         id="path4355"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccccccccccccccccc" />
+    </g>
+    <g
+       style="display:inline"
+       id="src/plugins/texteditor/images/lightbulb"
+       transform="translate(38,2)">
+      <rect
+         style="fill:#ffffff"
+         x="1180"
+         y="571"
+         width="10"
+         height="11"
+         id="rect6782-96-0-0-7-8-1-0-4-4-9" />
+      <path
+         style="fill:#000000"
+         d="m 1183,578 c 0,0 0,0.17678 -1.5,-2.32322 -1.5,-2.5 0.5,-4.67678 3.5,-4.67678 3,0 5,2.17678 3.5,4.67678 -1.5,2.5 -1.5,2.32322 -1.5,2.32322 z"
+         id="path4349-1"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="czzzcc" />
+    </g>
   </g>
   <g
      inkscape:groupmode="layer"