diff --git a/tools/assets/ic_launcher_128.png b/tools/assets/ic_launcher_128.png
new file mode 100644
index 00000000..abf412d5
Binary files /dev/null and b/tools/assets/ic_launcher_128.png differ
diff --git a/tools/assets/ic_launcher_16.png b/tools/assets/ic_launcher_16.png
new file mode 100644
index 00000000..1347de57
Binary files /dev/null and b/tools/assets/ic_launcher_16.png differ
diff --git a/tools/assets/ic_launcher_32.png b/tools/assets/ic_launcher_32.png
new file mode 100644
index 00000000..e7818a28
Binary files /dev/null and b/tools/assets/ic_launcher_32.png differ
diff --git a/tools/build.gradle b/tools/build.gradle
index 510ed307..0e774d8c 100644
--- a/tools/build.gradle
+++ b/tools/build.gradle
@@ -22,6 +22,9 @@ subprojects {
   apply plugin: 'java'
   apply plugin: 'application'
 
+  sourceSets.main.resources.srcDirs += project(':tools').file('assets')
+  idea.module.resourceDirs += project(':tools').file('assets')
+
   dependencies {
     implementation project(':core')
     implementation "com.badlogicgames.gdx:gdx-backend-lwjgl:$gdxVersion"
@@ -35,4 +38,27 @@ subprojects {
   dependencies {
     testImplementation 'junit:junit:4.12'
   }
+
+  run {
+    ignoreExitValue true
+
+    // Required to run LWJGL3 java apps on MacOS
+    if (org.gradle.internal.os.OperatingSystem.current() == org.gradle.internal.os.OperatingSystem.MAC_OS) {
+      jvmArgs += "-XstartOnFirstThread"
+    }
+  }
+
+  jar {
+    archiveBaseName = project.name
+    duplicatesStrategy DuplicatesStrategy.EXCLUDE
+    dependsOn configurations.runtimeClasspath
+    from { configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) } }
+    manifest {
+      attributes 'Main-Class': application.mainClass
+    }
+
+    doLast {
+      file(archiveFile).setExecutable(true, false)
+    }
+  }
 }
diff --git a/tools/font-metrics/build.gradle b/tools/font-metrics/build.gradle
index 5349f173..9707ba65 100644
--- a/tools/font-metrics/build.gradle
+++ b/tools/font-metrics/build.gradle
@@ -1,26 +1 @@
-application {
-  mainClass = 'com.riiablo.FontMetricsTool'
-}
-
-run {
-  workingDir = rootProject.file('assets').path
-  setIgnoreExitValue(true)
-
-  // Required to run LWJGL3 java apps on MacOS
-  if (org.gradle.internal.os.OperatingSystem.current() == org.gradle.internal.os.OperatingSystem.MAC_OS) {
-    jvmArgs += "-XstartOnFirstThread"
-  }
-}
-
-jar {
-  archiveBaseName = project.name
-  dependsOn configurations.runtimeClasspath
-  from { configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) } }
-  manifest {
-    attributes 'Main-Class': application.mainClass
-  }
-
-  doLast {
-    file(archiveFile).setExecutable(true, false)
-  }
-}
+application.mainClassName = 'com.riiablo.FontMetricsTool'
diff --git a/tools/font-metrics/src/main/java/com/riiablo/FontMetricsTool.java b/tools/font-metrics/src/main/java/com/riiablo/FontMetricsTool.java
index 6bc89a28..9980ba2c 100644
--- a/tools/font-metrics/src/main/java/com/riiablo/FontMetricsTool.java
+++ b/tools/font-metrics/src/main/java/com/riiablo/FontMetricsTool.java
@@ -8,6 +8,7 @@ import com.kotcrab.vis.ui.widget.spinner.Spinner;
 
 import com.badlogic.gdx.Application;
 import com.badlogic.gdx.ApplicationAdapter;
+import com.badlogic.gdx.Files.FileType;
 import com.badlogic.gdx.Gdx;
 import com.badlogic.gdx.assets.AssetManager;
 import com.badlogic.gdx.backends.lwjgl.LwjglApplication;
@@ -52,6 +53,9 @@ public class FontMetricsTool extends ApplicationAdapter {
     FileHandle d2Home = homeDirs.first();
 
     LwjglApplicationConfiguration config = new LwjglApplicationConfiguration();
+    config.addIcon("ic_launcher_16.png", FileType.Internal);
+    config.addIcon("ic_launcher_32.png", FileType.Internal);
+    config.addIcon("ic_launcher_128.png", FileType.Internal);
     config.title = TAG;
     config.resizable = true;
     config.width = 800;
diff --git a/tools/map-viewer/build.gradle b/tools/map-viewer/build.gradle
index 28bb32f5..89449ca0 100644
--- a/tools/map-viewer/build.gradle
+++ b/tools/map-viewer/build.gradle
@@ -1,26 +1 @@
-application {
-    mainClass = 'com.riiablo.map.MapViewer'
-}
-
-run {
-  workingDir = rootProject.file('assets').path
-  setIgnoreExitValue(true)
-
-  // Required to run LWJGL3 java apps on MacOS
-  if (org.gradle.internal.os.OperatingSystem.current() == org.gradle.internal.os.OperatingSystem.MAC_OS) {
-    jvmArgs += "-XstartOnFirstThread"
-  }
-}
-
-jar {
-  archiveBaseName = project.name
-  dependsOn configurations.runtimeClasspath
-  from { configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) } }
-  manifest {
-    attributes 'Main-Class': application.mainClass
-  }
-
-  doLast {
-    file(archiveFile).setExecutable(true, false)
-  }
-}
+application.mainClassName = 'com.riiablo.map.MapViewer'
diff --git a/tools/map-viewer/src/main/java/com/riiablo/map/MapViewer.java b/tools/map-viewer/src/main/java/com/riiablo/map/MapViewer.java
index 2a99a79c..056ec1de 100644
--- a/tools/map-viewer/src/main/java/com/riiablo/map/MapViewer.java
+++ b/tools/map-viewer/src/main/java/com/riiablo/map/MapViewer.java
@@ -18,6 +18,7 @@ import net.mostlyoriginal.api.event.common.EventSystem;
 
 import com.badlogic.gdx.Application;
 import com.badlogic.gdx.ApplicationAdapter;
+import com.badlogic.gdx.Files.FileType;
 import com.badlogic.gdx.Gdx;
 import com.badlogic.gdx.Input;
 import com.badlogic.gdx.InputAdapter;
@@ -184,6 +185,9 @@ public class MapViewer extends ApplicationAdapter {
 
     LwjglApplicationConfiguration config = new LwjglApplicationConfiguration();
     config.title = "Map Viewer";
+    config.addIcon("ic_launcher_16.png", FileType.Internal);
+    config.addIcon("ic_launcher_32.png", FileType.Internal);
+    config.addIcon("ic_launcher_128.png", FileType.Internal);
     config.resizable = true;
     config.vSyncEnabled = false;
     config.width = 1280; // 1280