diff --git a/Projekte/mdga/client/src/main/java/pp/mdga/client/MdgaApp.java b/Projekte/mdga/client/src/main/java/pp/mdga/client/MdgaApp.java
index cc285fa7..89634ca2 100644
--- a/Projekte/mdga/client/src/main/java/pp/mdga/client/MdgaApp.java
+++ b/Projekte/mdga/client/src/main/java/pp/mdga/client/MdgaApp.java
@@ -8,7 +8,10 @@
 import pp.mdga.client.dialog.JoinDialog;
 import pp.mdga.client.view.*;
 
+import javax.imageio.ImageIO;
 import java.awt.*;
+import java.io.File;
+import java.io.IOException;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.prefs.Preferences;
@@ -132,6 +135,12 @@ public static void main(String[] args) {
         app.setPauseOnLostFocus(false);
         app.setDisplayStatView(false);
 
+        try {
+            settings.setIcons(new Image[]{ImageIO.read(new File("src/main/resources/Images/icon/icon128.png"))});
+        } catch (IOException e) {
+            System.out.println(e.getMessage());
+        }
+
         app.start();
     }
 
diff --git a/Projekte/mdga/client/src/main/java/pp/mdga/client/NotificationSynchronizer.java b/Projekte/mdga/client/src/main/java/pp/mdga/client/NotificationSynchronizer.java
index 3f4cca69..c91c3915 100644
--- a/Projekte/mdga/client/src/main/java/pp/mdga/client/NotificationSynchronizer.java
+++ b/Projekte/mdga/client/src/main/java/pp/mdga/client/NotificationSynchronizer.java
@@ -231,12 +231,10 @@ private void handleGame(Notification notification) {
             if (n.getColor() == ownColor) guiHandler.playCardOwn(n.getCard());
             else guiHandler.playCardEnemy(n.getColor(), n.getCard());
 
-            new Timer().schedule(new TimerTask() {
-                @Override
-                public void run() {
-                    app.getModelSynchronize().animationEnd();
-                }
-            }, 2200 * MdgaApp.DEBUG_MULTIPLIER);
+            app.getTimerManager().addTask(
+                    2.2f * MdgaApp.DEBUG_MULTIPLIER,
+                    app.getModelSynchronize()::animationEnd
+            );
         } else if (notification instanceof PlayerInGameNotification n) {
             boardHandler.addPlayer(n.getColor(), n.getPiecesList());
             guiHandler.addPlayer(n.getColor(), n.getName());
diff --git a/Projekte/mdga/client/src/main/java/pp/mdga/client/animation/ShellAnimation.java b/Projekte/mdga/client/src/main/java/pp/mdga/client/animation/ShellAnimation.java
index 930b974d..c8a446dc 100644
--- a/Projekte/mdga/client/src/main/java/pp/mdga/client/animation/ShellAnimation.java
+++ b/Projekte/mdga/client/src/main/java/pp/mdga/client/animation/ShellAnimation.java
@@ -189,11 +189,6 @@ private void createEffect(Vector3f shootPos,
         explosionEmitter.setParticlesPerSec(0);
         explosionEmitter.emitAllParticles();
         app.getRootNode().attachChild(explosionEmitter);
-        new Timer().schedule(new TimerTask() {
-            @Override
-            public void run() {
-                app.getRootNode().detachChild(explosionEmitter);
-            }
-        }, 1000);
+        app.getTimerManager().addTask(1, ()->app.getRootNode().detachChild(explosionEmitter));
     }
 }
diff --git a/Projekte/mdga/client/src/main/java/pp/mdga/client/board/BoardHandler.java b/Projekte/mdga/client/src/main/java/pp/mdga/client/board/BoardHandler.java
index 065c3019..cf5d7311 100644
--- a/Projekte/mdga/client/src/main/java/pp/mdga/client/board/BoardHandler.java
+++ b/Projekte/mdga/client/src/main/java/pp/mdga/client/board/BoardHandler.java
@@ -225,7 +225,7 @@ private Spatial createModel(Asset asset, Vector3f pos, float rot) {
      * @param y The y-coordinate on the grid
      * @return The corresponding world position
      */
-    private static Vector3f gridToWorld(int x, int y) {
+    public static Vector3f gridToWorld(int x, int y) {
         return new Vector3f(GRID_SIZE * x, GRID_SIZE * y, GRID_ELEVATION);
     }
 
diff --git a/Projekte/mdga/client/src/main/resources/Images/icon/icon128.png b/Projekte/mdga/client/src/main/resources/Images/icon/icon128.png
new file mode 100644
index 00000000..99c939e8
Binary files /dev/null and b/Projekte/mdga/client/src/main/resources/Images/icon/icon128.png differ