diff --git a/openscad_win32.rc b/openscad_win32.rc
index ffdc7e24..95be2192 100644
--- a/openscad_win32.rc
+++ b/openscad_win32.rc
@@ -33,5 +33,6 @@ VS_VERSION_INFO VERSIONINFO
 /* End of Version info */
 
 IDI_ICON1   ICON    DISCARDABLE "icons/openscad.ico"
+IDI_ICON2   ICON    DISCARDABLE "icons/openscad_doc.ico"
 
 
diff --git a/src/openscad.cc b/src/openscad.cc
index 0b0de394..7be03d27 100644
--- a/src/openscad.cc
+++ b/src/openscad.cc
@@ -43,6 +43,8 @@
 #include "CocoaUtils.h"
 #include "FontCache.h"
 
+#include <QDir>
+
 #include <string>
 #include <vector>
 #include <fstream>
@@ -318,6 +320,12 @@ int cmdline(const char *deps_output_file, const std::string &filename, Camera &c
 	parser_init();
 	localization_init();
 
+#ifdef Q_OS_WIN
+    QSettings reg_setting(QLatin1String("HKEY_CURRENT_USER"), QSettings::NativeFormat);
+    QString appPath = QDir::toNativeSeparators(app.applicationFilePath() + QLatin1String(",1"));
+    reg_setting.setValue(QLatin1String("Software/Classes/OpenSCAD_File/DefaultIcon/Default"),QVariant(appPath));
+#endif
+
 	Tree tree;
 #ifdef ENABLE_CGAL
 	GeometryEvaluator geomevaluator(tree);
@@ -664,6 +672,12 @@ int gui(vector<string> &inputFiles, const fs::path &original_path, int argc, cha
 	installAppleEventHandlers();
 #endif
 
+#ifdef Q_OS_WIN
+    QSettings reg_setting(QLatin1String("HKEY_CURRENT_USER"), QSettings::NativeFormat);
+    QString appPath = QDir::toNativeSeparators(app.applicationFilePath() + QLatin1String(",1"));
+    reg_setting.setValue(QLatin1String("Software/Classes/OpenSCAD_File/DefaultIcon/Default"),QVariant(appPath));
+#endif
+
 #ifdef OPENSCAD_UPDATER
 	AutoUpdater *updater = new SparkleAutoUpdater;
 	AutoUpdater::setUpdater(updater);
@@ -901,4 +915,3 @@ int main(int argc, char **argv)
 
 	return rc;
 }
-