diff --git a/desktop/app.js b/desktop/app.js
index 6060c5a2..ec48d1e1 100644
--- a/desktop/app.js
+++ b/desktop/app.js
@@ -54,6 +54,7 @@ const defaultBgColor = '#282C34';
 
 perfTimestamps && perfTimestamps.push({ name: 'defining args', ts: process.hrtime() });
 
+setDevAppIcon();
 setEnv();
 restorePreferences();
 
@@ -556,6 +557,15 @@ function deleteRecursive(dir) {
     fs.rmdirSync(dir);
 }
 
+function setDevAppIcon() {
+    if (isDev && htmlPath) {
+        const icon = electron.nativeImage.createFromPath(
+            path.join(__dirname, '../graphics/512x512.png')
+        );
+        app.dock.setIcon(icon);
+    }
+}
+
 // When sending a PUT XMLHttpRequest Chromium includes the header "Origin: file://".
 // This confuses some WebDAV clients, notably OwnCloud.
 // The header is invalid, so removing it everywhere it occurs should do no harm.
diff --git a/graphics/512x512.png b/graphics/512x512.png
new file mode 100644
index 00000000..7313fb32
Binary files /dev/null and b/graphics/512x512.png differ