diff --git a/share/qtcreator/templates/wizards/classes/cpp/wizard.json b/share/qtcreator/templates/wizards/classes/cpp/wizard.json
index 7c690b54c6f..18b84d8d56c 100644
--- a/share/qtcreator/templates/wizards/classes/cpp/wizard.json
+++ b/share/qtcreator/templates/wizards/classes/cpp/wizard.json
@@ -6,6 +6,7 @@
     "trDescription": "Creates a C++ header and a source file for a new class that you can add to a C++ project.",
     "trDisplayName": "C++ Class",
     "trDisplayCategory": "C++",
+    "iconText": "h/cpp",
     "enabled": "%{JS: [ %{Plugins} ].indexOf('CppEditor') >= 0}",
 
     "options":
diff --git a/share/qtcreator/templates/wizards/classes/python/wizard.json b/share/qtcreator/templates/wizards/classes/python/wizard.json
index d3613085b09..7031d0ba991 100644
--- a/share/qtcreator/templates/wizards/classes/python/wizard.json
+++ b/share/qtcreator/templates/wizards/classes/python/wizard.json
@@ -6,6 +6,7 @@
     "trDescription": "Creates new Python class file.",
     "trDisplayName": "Python Class",
     "trDisplayCategory": "Python",
+    "iconText": "py",
     "enabled": "%{JS: [ %{Plugins} ].indexOf('PythonEditor') >= 0}",
 
     "options":
diff --git a/share/qtcreator/templates/wizards/classes/qtquickui/wizard.json b/share/qtcreator/templates/wizards/classes/qtquickui/wizard.json
index 3786457ee10..a1d43389940 100644
--- a/share/qtcreator/templates/wizards/classes/qtquickui/wizard.json
+++ b/share/qtcreator/templates/wizards/classes/qtquickui/wizard.json
@@ -6,6 +6,7 @@
     "trDescription": "Creates a Qt Quick Designer UI form along with a matching QML file for implementation purposes. You can add the form and file to an existing Qt Quick Project.",
     "trDisplayName": "QtQuick UI File",
     "trDisplayCategory": "Qt",
+    "iconText": "ui.qml",
     "featuresRequired": [ "QtSupport.Wizards.FeatureQtQuick.UiFiles" ],
     "enabled": "%{JS: [ %{Plugins} ].indexOf('QmlJSEditor') >= 0}",
 
diff --git a/share/qtcreator/templates/wizards/files/cppheader/wizard.json b/share/qtcreator/templates/wizards/files/cppheader/wizard.json
index 6ea6fe5b09a..bda6770d098 100644
--- a/share/qtcreator/templates/wizards/files/cppheader/wizard.json
+++ b/share/qtcreator/templates/wizards/files/cppheader/wizard.json
@@ -6,6 +6,7 @@
     "trDescription": "Creates a C++ header file that you can add to a C++ project.",
     "trDisplayName": "C++ Header File",
     "trDisplayCategory": "C++",
+    "iconText": "h",
     "enabled": "%{JS: [ %{Plugins} ].indexOf('CppEditor') >= 0}",
 
     "options": { "key": "FileName", "value": "%{JS: Cpp.fileName('%{TargetPath}', '%{JS: Util.preferredSuffix('text/x-c++hdr')}')}" },
diff --git a/share/qtcreator/templates/wizards/files/cppsource/wizard.json b/share/qtcreator/templates/wizards/files/cppsource/wizard.json
index 504de97238e..7eebc282b50 100644
--- a/share/qtcreator/templates/wizards/files/cppsource/wizard.json
+++ b/share/qtcreator/templates/wizards/files/cppsource/wizard.json
@@ -6,6 +6,7 @@
     "trDescription": "Creates a C++ source file that you can add to a C++ project.",
     "trDisplayName": "C++ Source File",
     "trDisplayCategory": "C++",
+    "iconText": "cpp",
     "enabled": "%{JS: [ %{Plugins} ].indexOf('CppEditor') >= 0}",
 
     "options": { "key": "FileName", "value": "%{JS: Cpp.fileName('%{TargetPath}', '%{JS: Util.preferredSuffix('text/x-c++src')}')}" },
diff --git a/share/qtcreator/templates/wizards/files/form/wizard.json b/share/qtcreator/templates/wizards/files/form/wizard.json
index 2e3a42671d5..26d15d2b59a 100644
--- a/share/qtcreator/templates/wizards/files/form/wizard.json
+++ b/share/qtcreator/templates/wizards/files/form/wizard.json
@@ -6,6 +6,7 @@
     "trDescription": "Creates a Qt Designer form that you can add to a Qt Widget Project. This is useful if you already have an existing class for the UI business logic.",
     "trDisplayName": "Qt Designer Form",
     "trDisplayCategory": "Qt",
+    "iconText": "ui",
     "enabled": "%{JS: [ %{Plugins} ].indexOf('Designer') >= 0}",
 
     "options": [
diff --git a/share/qtcreator/templates/wizards/files/glsl/gl/fragment/wizard.json b/share/qtcreator/templates/wizards/files/glsl/gl/fragment/wizard.json
index e3229e274c5..eb5e9947826 100644
--- a/share/qtcreator/templates/wizards/files/glsl/gl/fragment/wizard.json
+++ b/share/qtcreator/templates/wizards/files/glsl/gl/fragment/wizard.json
@@ -6,6 +6,7 @@
     "trDescription": "Creates a fragment shader in the Desktop OpenGL Shading Language (GLSL). Fragment shaders generate the final pixel colors for triangles, points and lines rendered with OpenGL.",
     "trDisplayName": "Fragment Shader (Desktop OpenGL)",
     "trDisplayCategory": "GLSL",
+    "iconText": "frag",
     "platformIndependent": true,
     "enabled": "%{JS: [ %{Plugins} ].indexOf('GLSLEditor') >= 0}",
 
diff --git a/share/qtcreator/templates/wizards/files/glsl/gl/vertex/wizard.json b/share/qtcreator/templates/wizards/files/glsl/gl/vertex/wizard.json
index a1c5904e4c9..bd76a76d6b6 100644
--- a/share/qtcreator/templates/wizards/files/glsl/gl/vertex/wizard.json
+++ b/share/qtcreator/templates/wizards/files/glsl/gl/vertex/wizard.json
@@ -6,6 +6,7 @@
     "trDescription": "Creates a vertex shader in the Desktop OpenGL Shading Language (GLSL). Vertex shaders transform the positions, normals and texture coordinates of triangles, points and lines rendered with OpenGL.",
     "trDisplayName": "Vertex Shader (Desktop OpenGL)",
     "trDisplayCategory": "GLSL",
+    "iconText": "vert",
     "platformIndependent": true,
     "enabled": "%{JS: [ %{Plugins} ].indexOf('GLSLEditor') >= 0}",
 
diff --git a/share/qtcreator/templates/wizards/files/glsl/gles/fragment/wizard.json b/share/qtcreator/templates/wizards/files/glsl/gles/fragment/wizard.json
index c83c58e8bbb..c95b336aea6 100644
--- a/share/qtcreator/templates/wizards/files/glsl/gles/fragment/wizard.json
+++ b/share/qtcreator/templates/wizards/files/glsl/gles/fragment/wizard.json
@@ -6,6 +6,7 @@
     "trDescription": "Creates a fragment shader in the OpenGL/ES 2.0 Shading Language (GLSL/ES). Fragment shaders generate the final pixel colors for triangles, points and lines rendered with OpenGL.",
     "trDisplayName": "Fragment Shader (OpenGL/ES 2.0)",
     "trDisplayCategory": "GLSL",
+    "iconText": "fsh",
     "platformIndependent": true,
     "enabled": "%{JS: [ %{Plugins} ].indexOf('GLSLEditor') >= 0}",
 
diff --git a/share/qtcreator/templates/wizards/files/glsl/gles/vertex/wizard.json b/share/qtcreator/templates/wizards/files/glsl/gles/vertex/wizard.json
index edddc2dc157..68d430d29dd 100644
--- a/share/qtcreator/templates/wizards/files/glsl/gles/vertex/wizard.json
+++ b/share/qtcreator/templates/wizards/files/glsl/gles/vertex/wizard.json
@@ -6,6 +6,7 @@
     "trDescription": "Creates a vertex shader in the OpenGL/ES 2.0 Shading Language (GLSL/ES). Vertex shaders transform the positions, normals and texture coordinates of triangles, points and lines rendered with OpenGL.",
     "trDisplayName": "Vertex Shader (OpenGL/ES 2.0)",
     "trDisplayCategory": "GLSL",
+    "iconText": "vsh",
     "platformIndependent": true,
     "enabled": "%{JS: [ %{Plugins} ].indexOf('GLSLEditor') >= 0}",
 
diff --git a/share/qtcreator/templates/wizards/files/java/wizard.json b/share/qtcreator/templates/wizards/files/java/wizard.json
index 8986fb961b1..427dc84e16a 100644
--- a/share/qtcreator/templates/wizards/files/java/wizard.json
+++ b/share/qtcreator/templates/wizards/files/java/wizard.json
@@ -6,6 +6,7 @@
     "trDescription": "Creates a Java file with boilerplate code.",
     "trDisplayName": "Java File",
     "trDisplayCategory": "Java",
+    "iconText": "java",
     "enabled": "%{JS: [ %{Plugins} ].indexOf('Android') >= 0}",
 
     "options": [ { "key": "ClassName", "value": "%{JS: '%{FileName}'.charAt(0).toUpperCase() + '%{FileName}'.substr(1)}" } ],
diff --git a/share/qtcreator/templates/wizards/files/js/wizard.json b/share/qtcreator/templates/wizards/files/js/wizard.json
index 57886e007bc..62d3211cda3 100644
--- a/share/qtcreator/templates/wizards/files/js/wizard.json
+++ b/share/qtcreator/templates/wizards/files/js/wizard.json
@@ -6,6 +6,7 @@
     "trDescription": "Creates a JavaScript file.",
     "trDisplayName": "JS File",
     "trDisplayCategory": "Qt",
+    "iconText": "js",
     "enabled": "%{JS: [ %{Plugins} ].indexOf('QmlJSEditor') >= 0}",
 
     "pages" :
diff --git a/share/qtcreator/templates/wizards/files/modeling/wizard.json b/share/qtcreator/templates/wizards/files/modeling/wizard.json
index 75b0958524e..2f8cff689a1 100644
--- a/share/qtcreator/templates/wizards/files/modeling/wizard.json
+++ b/share/qtcreator/templates/wizards/files/modeling/wizard.json
@@ -6,6 +6,7 @@
     "trDescription": "Creates a new empty model with an empty diagram.",
     "trDisplayName": "Model",
     "trDisplayCategory": "Modeling",
+    "iconText": "qmodel",
     "platformIndependent": true,
     "enabled": "%{JS: [ %{Plugins} ].indexOf('ModelEditor') >= 0}",
 
diff --git a/share/qtcreator/templates/wizards/files/python/wizard.json b/share/qtcreator/templates/wizards/files/python/wizard.json
index d9bf8456317..32b720f3d40 100644
--- a/share/qtcreator/templates/wizards/files/python/wizard.json
+++ b/share/qtcreator/templates/wizards/files/python/wizard.json
@@ -6,6 +6,7 @@
     "trDescription": "Creates an empty Python script file using UTF-8 charset.",
     "trDisplayName": "Python File",
     "trDisplayCategory": "Python",
+    "iconText": "py",
     "enabled": "%{JS: [ %{Plugins} ].indexOf('PythonEditor') >= 0}",
 
     "pages" :
diff --git a/share/qtcreator/templates/wizards/files/qrc/wizard.json b/share/qtcreator/templates/wizards/files/qrc/wizard.json
index 0badcf7acc8..bbbd8e98f99 100644
--- a/share/qtcreator/templates/wizards/files/qrc/wizard.json
+++ b/share/qtcreator/templates/wizards/files/qrc/wizard.json
@@ -6,6 +6,7 @@
     "trDescription": "Creates a Qt Resource file (.qrc).",
     "trDisplayName": "Qt Resource File",
     "trDisplayCategory": "Qt",
+    "iconText": "qrc",
     "enabled": "%{JS: [ %{Plugins} ].indexOf('ResourceEditor') >= 0}",
 
     "pages" :
diff --git a/share/qtcreator/templates/wizards/files/qtquick2/wizard.json b/share/qtcreator/templates/wizards/files/qtquick2/wizard.json
index 5a4c8bbf6fd..544368b1735 100644
--- a/share/qtcreator/templates/wizards/files/qtquick2/wizard.json
+++ b/share/qtcreator/templates/wizards/files/qtquick2/wizard.json
@@ -6,6 +6,7 @@
     "trDescription": "Creates a QML file with boilerplate code, starting with \"import QtQuick 2.0\".",
     "trDisplayName": "QML File (Qt Quick 2)",
     "trDisplayCategory": "Qt",
+    "iconText": "qml",
     "enabled": "%{JS: [ %{Plugins} ].indexOf('QmlJSEditor') >= 0}",
 
     "pages" :
diff --git a/share/qtcreator/templates/wizards/files/scxml/wizard.json b/share/qtcreator/templates/wizards/files/scxml/wizard.json
index f9d72469252..893662337d8 100644
--- a/share/qtcreator/templates/wizards/files/scxml/wizard.json
+++ b/share/qtcreator/templates/wizards/files/scxml/wizard.json
@@ -6,6 +6,7 @@
     "trDescription": "Creates a new empty state chart.",
     "trDisplayName": "State Chart",
     "trDisplayCategory": "Modeling",
+    "iconText": "scxml",
     "platformIndependent": true,
     "enabled": "%{JS: [ %{Plugins} ].indexOf('QtSupport') >= 0}",
 
diff --git a/share/qtcreator/templates/wizards/files/text/wizard.json b/share/qtcreator/templates/wizards/files/text/wizard.json
index 2e20706c554..11e0577a2de 100644
--- a/share/qtcreator/templates/wizards/files/text/wizard.json
+++ b/share/qtcreator/templates/wizards/files/text/wizard.json
@@ -6,6 +6,7 @@
     "trDescription": "Creates an empty file.",
     "trDisplayName": "Empty File",
     "trDisplayCategory": "General",
+    "iconText": "txt",
     "platformIndependent": true,
     "enabled": "%{JS: [ %{Plugins} ].indexOf('TextEditor') >= 0}",
 
diff --git a/src/plugins/designer/formeditorplugin.cpp b/src/plugins/designer/formeditorplugin.cpp
index 1abc12a8032..8a4f0af3de7 100644
--- a/src/plugins/designer/formeditorplugin.cpp
+++ b/src/plugins/designer/formeditorplugin.cpp
@@ -87,6 +87,7 @@ bool FormEditorPlugin::initialize(const QStringList &arguments, QString *error)
                     wizard->setCategory(QLatin1String(Core::Constants::WIZARD_CATEGORY_QT));
                     wizard->setDisplayCategory(QCoreApplication::translate("Core", Core::Constants::WIZARD_TR_CATEGORY_QT));
                     wizard->setDisplayName(tr("Qt Designer Form Class"));
+                    wizard->setIconText("ui/h");
                     wizard->setId("C.FormClass");
                     wizard->setDescription(tr("Creates a Qt Designer form along with a matching class (C++ header and source file) "
                     "for implementation purposes. You can add the form and class to an existing Qt Widget Project."));