diff --git a/plugin-tiled/assets/pack/tiled.png b/plugin-tiled/assets/pack/tiled.png
index 38cdf5ef..b4327c44 100644
Binary files a/plugin-tiled/assets/pack/tiled.png and b/plugin-tiled/assets/pack/tiled.png differ
diff --git a/src/main/java/games/rednblack/editor/view/stage/tools/SelectionTool.java b/src/main/java/games/rednblack/editor/view/stage/tools/SelectionTool.java
index 9aa42356..2ac7f258 100644
--- a/src/main/java/games/rednblack/editor/view/stage/tools/SelectionTool.java
+++ b/src/main/java/games/rednblack/editor/view/stage/tools/SelectionTool.java
@@ -445,7 +445,8 @@ public class SelectionTool extends SimpleTool {
             dragStartPositions.clear();
             for (Entity itemInstance : sandbox.getSelector().getCurrentSelection()) {
                 transformComponent = ComponentRetriever.get(itemInstance, TransformComponent.class);
-                dragStartPositions.put(itemInstance, new Vector2(transformComponent.x, transformComponent.y));
+                if (transformComponent != null)
+                    dragStartPositions.put(itemInstance, new Vector2(transformComponent.x, transformComponent.y));
             }
 
             if (keycode == Input.Keys.UP) {