diff --git a/openscad.pro b/openscad.pro
index 6cda2621..23beea7e 100644
--- a/openscad.pro
+++ b/openscad.pro
@@ -77,6 +77,7 @@ deploy {
   DEFINES += OPENSCAD_DEPLOY
   macx: CONFIG += sparkle
 }
+snapshot: DEFINES += OPENSCAD_SNAPSHOT
 
 macx {
   TARGET = OpenSCAD
diff --git a/openscad.qrc b/openscad.qrc
index bc855681..8f72f876 100644
--- a/openscad.qrc
+++ b/openscad.qrc
@@ -20,6 +20,7 @@
     <file>icons/information-icons-question.png</file>
     <file>icons/information-icons-warning.png</file>
     <file>icons/openscad.png</file>
+    <file>icons/openscad-nightly.png</file>
     <file>icons/button.png</file>
     <file>icons/background-welcome-screen.svg</file>
     <file>icons/prefsFeatures.png</file>
diff --git a/src/openscad.cc b/src/openscad.cc
index 33192ac8..e0ac9532 100644
--- a/src/openscad.cc
+++ b/src/openscad.cc
@@ -654,6 +654,11 @@ int gui(vector<string> &inputFiles, const fs::path &original_path, int argc, cha
 #else
 	QTextCodec::setCodecForCStrings(QTextCodec::codecForName("UTF-8"));
 #endif
+#ifdef OPENSCAD_SNAPSHOT
+	app.setWindowIcon(QIcon(":/icons/openscad-nightly.png"));
+#else
+	app.setWindowIcon(QIcon(":/icons/openscad.png"));
+#endif
 	
 	// Other global settings
 	qRegisterMetaType<shared_ptr<const Geometry> >();