diff --git a/h2d-libgdx-tinyvg-extension b/h2d-libgdx-tinyvg-extension
index b18e07ee..5e4a5494 160000
--- a/h2d-libgdx-tinyvg-extension
+++ b/h2d-libgdx-tinyvg-extension
@@ -1 +1 @@
-Subproject commit b18e07eed296605c8ebd4dc1984119d69c868fd1
+Subproject commit 5e4a5494cf0516018e2294e0864a0425a6ab6a4b
diff --git a/hyperlap2d-runtime-libgdx b/hyperlap2d-runtime-libgdx
index b808fa4e..70488d7e 160000
--- a/hyperlap2d-runtime-libgdx
+++ b/hyperlap2d-runtime-libgdx
@@ -1 +1 @@
-Subproject commit b808fa4ec1862d2abd9a7146e2b9deb0f1bafb53
+Subproject commit 70488d7e963a6b9144e3435979a9472b90b2d47a
diff --git a/src/main/java/games/rednblack/editor/view/ui/box/resourcespanel/UIImagesTabMediator.java b/src/main/java/games/rednblack/editor/view/ui/box/resourcespanel/UIImagesTabMediator.java
index b62cdcf0..3a6e1919 100644
--- a/src/main/java/games/rednblack/editor/view/ui/box/resourcespanel/UIImagesTabMediator.java
+++ b/src/main/java/games/rednblack/editor/view/ui/box/resourcespanel/UIImagesTabMediator.java
@@ -33,6 +33,7 @@ import games.rednblack.editor.view.ui.box.resourcespanel.draggable.DraggableReso
 import games.rednblack.editor.view.ui.box.resourcespanel.draggable.box.ImageResource;
 import games.rednblack.editor.view.ui.box.resourcespanel.draggable.box.TinyVGResource;
 import games.rednblack.editor.view.ui.widget.actors.basic.WhitePixel;
+import games.rednblack.h2d.extension.tinyvg.CpuTinyVGShapeDrawer;
 import org.apache.commons.lang3.ArrayUtils;
 import org.puremvc.java.interfaces.INotification;
 
@@ -78,7 +79,7 @@ public class UIImagesTabMediator extends UIResourcesTabMediator<UIImagesTab> {
     @Override
     protected void initList(String searchText) {
         if (drawer == null)
-            drawer = new TinyVGShapeDrawer(Sandbox.getInstance().getUIStage().getBatch(), WhitePixel.sharedInstance.textureRegion);
+            drawer = new CpuTinyVGShapeDrawer(Sandbox.getInstance().getUIStage().getBatch(), WhitePixel.sharedInstance.textureRegion);
 
         ResourceManager resourceManager = facade.retrieveProxy(ResourceManager.NAME);
         ProjectManager projectManager = facade.retrieveProxy(ProjectManager.NAME);