diff --git a/src/Gui/Application.cpp b/src/Gui/Application.cpp
index 0a41afb46089..b10adbeb168b 100644
--- a/src/Gui/Application.cpp
+++ b/src/Gui/Application.cpp
@@ -1680,6 +1680,10 @@ void Application::runApplication(void)
     else if (version & QGLFormat::OpenGL_Version_None)
         Base::Console().Log("No OpenGL is present or no OpenGL context is current\n");
 
+#if !defined(Q_WS_X11)
+    QIcon::setThemeName(QLatin1String("FreeCAD-default"));
+#endif
+
     Application app(true);
     MainWindow mw;
     mw.setWindowTitle(mainApp.applicationName());
diff --git a/src/Gui/Icons/index.theme b/src/Gui/Icons/index.theme
new file mode 100644
index 000000000000..13de165218c9
--- /dev/null
+++ b/src/Gui/Icons/index.theme
@@ -0,0 +1,13 @@
+[Icon Theme]
+Name=FreeCAD-default
+Comment=Default FreeCAD icon theme
+Inherits=Default
+
+# Directory list
+Directories=.
+
+[.]
+Size=48
+MinSize=8
+MaxSize=512
+Type=Scalable
diff --git a/src/Gui/Icons/resource.qrc b/src/Gui/Icons/resource.qrc
index d16f5d53bc46..fa2240ce5c69 100644
--- a/src/Gui/Icons/resource.qrc
+++ b/src/Gui/Icons/resource.qrc
@@ -113,5 +113,6 @@
         <file>DrawStyleShaded.svg</file>
         <file>DrawStyleWireFrame.svg</file>
         <file>user.svg</file>
+        <file>index.theme</file>
     </qresource>
 </RCC>