diff --git a/android/assets/ui/x0.75/cells/basic.png b/android/assets/ui/x0.75/cells/basic.png
new file mode 100644
index 0000000..f242f18
Binary files /dev/null and b/android/assets/ui/x0.75/cells/basic.png differ
diff --git a/android/assets/ui/x0.75/cells/bubble.png b/android/assets/ui/x0.75/cells/bubble.png
new file mode 100644
index 0000000..54eb12d
Binary files /dev/null and b/android/assets/ui/x0.75/cells/bubble.png differ
diff --git a/android/assets/ui/x1.0/cells/basic.png b/android/assets/ui/x1.0/cells/basic.png
new file mode 100644
index 0000000..da45655
Binary files /dev/null and b/android/assets/ui/x1.0/cells/basic.png differ
diff --git a/android/assets/ui/x1.0/cells/bubble.png b/android/assets/ui/x1.0/cells/bubble.png
new file mode 100644
index 0000000..49996f3
Binary files /dev/null and b/android/assets/ui/x1.0/cells/bubble.png differ
diff --git a/android/assets/ui/x1.0/cells/round.png b/android/assets/ui/x1.0/cells/round.png
new file mode 100644
index 0000000..8555cfd
Binary files /dev/null and b/android/assets/ui/x1.0/cells/round.png differ
diff --git a/android/assets/ui/x1.25/cells/basic.png b/android/assets/ui/x1.25/cells/basic.png
new file mode 100644
index 0000000..7f6141f
Binary files /dev/null and b/android/assets/ui/x1.25/cells/basic.png differ
diff --git a/android/assets/ui/x1.25/cells/bubble.png b/android/assets/ui/x1.25/cells/bubble.png
new file mode 100644
index 0000000..8bece5e
Binary files /dev/null and b/android/assets/ui/x1.25/cells/bubble.png differ
diff --git a/android/assets/ui/x1.25/cells/round.png b/android/assets/ui/x1.25/cells/round.png
new file mode 100644
index 0000000..bd5b071
Binary files /dev/null and b/android/assets/ui/x1.25/cells/round.png differ
diff --git a/android/assets/ui/x1.5/cells/basic.png b/android/assets/ui/x1.5/cells/basic.png
new file mode 100644
index 0000000..f5fe488
Binary files /dev/null and b/android/assets/ui/x1.5/cells/basic.png differ
diff --git a/android/assets/ui/x1.5/cells/bubble.png b/android/assets/ui/x1.5/cells/bubble.png
new file mode 100644
index 0000000..d5556ac
Binary files /dev/null and b/android/assets/ui/x1.5/cells/bubble.png differ
diff --git a/android/assets/ui/x1.5/cells/round.png b/android/assets/ui/x1.5/cells/round.png
new file mode 100644
index 0000000..ae0481b
Binary files /dev/null and b/android/assets/ui/x1.5/cells/round.png differ
diff --git a/android/assets/ui/x2.0/cells/basic.png b/android/assets/ui/x2.0/cells/basic.png
new file mode 100644
index 0000000..2058054
Binary files /dev/null and b/android/assets/ui/x2.0/cells/basic.png differ
diff --git a/android/assets/ui/x2.0/cells/bubble.png b/android/assets/ui/x2.0/cells/bubble.png
new file mode 100644
index 0000000..4f29be6
Binary files /dev/null and b/android/assets/ui/x2.0/cells/bubble.png differ
diff --git a/android/assets/ui/x2.0/cells/round.png b/android/assets/ui/x2.0/cells/round.png
new file mode 100644
index 0000000..8574550
Binary files /dev/null and b/android/assets/ui/x2.0/cells/round.png differ
diff --git a/android/assets/ui/x4.0/cells/basic.png b/android/assets/ui/x4.0/cells/basic.png
new file mode 100644
index 0000000..83c16f9
Binary files /dev/null and b/android/assets/ui/x4.0/cells/basic.png differ
diff --git a/android/assets/ui/x4.0/cells/bubble.png b/android/assets/ui/x4.0/cells/bubble.png
new file mode 100644
index 0000000..3521739
Binary files /dev/null and b/android/assets/ui/x4.0/cells/bubble.png differ
diff --git a/android/assets/ui/x4.0/cells/round.png b/android/assets/ui/x4.0/cells/round.png
new file mode 100644
index 0000000..595f57d
Binary files /dev/null and b/android/assets/ui/x4.0/cells/round.png differ
diff --git a/core/src/io/github/lonamiwebs/klooni/SkinLoader.java b/core/src/io/github/lonamiwebs/klooni/SkinLoader.java
index 2e84905..485c1dd 100644
--- a/core/src/io/github/lonamiwebs/klooni/SkinLoader.java
+++ b/core/src/io/github/lonamiwebs/klooni/SkinLoader.java
@@ -59,7 +59,7 @@ public class SkinLoader {
     }
 
     public static Texture loadPng(String name) {
-        final String filename = "ui/x" + bestMultiplier + "/" + name + ".png";
+        final String filename = "ui/x" + bestMultiplier + "/" + name;
         return new Texture(Gdx.files.internal(filename));
     }
 }
diff --git a/core/src/io/github/lonamiwebs/klooni/Theme.java b/core/src/io/github/lonamiwebs/klooni/Theme.java
index fe66551..d366851 100644
--- a/core/src/io/github/lonamiwebs/klooni/Theme.java
+++ b/core/src/io/github/lonamiwebs/klooni/Theme.java
@@ -153,7 +153,7 @@ public class Theme {
         }
 
         String cellTextureFile = json.getString("cell_texture");
-        cellTexture = new Texture(Gdx.files.internal("ui/cells/"+cellTextureFile));
+        cellTexture = SkinLoader.loadPng("cells/"+cellTextureFile);
 
         return this;
     }
diff --git a/core/src/io/github/lonamiwebs/klooni/game/BaseScorer.java b/core/src/io/github/lonamiwebs/klooni/game/BaseScorer.java
index e8d9900..c5017a6 100644
--- a/core/src/io/github/lonamiwebs/klooni/game/BaseScorer.java
+++ b/core/src/io/github/lonamiwebs/klooni/game/BaseScorer.java
@@ -37,7 +37,7 @@ public abstract class BaseScorer implements BinSerializable {
 
     // The board size is required when calculating the score
     BaseScorer(final Klooni game, GameLayout layout, int highScore) {
-        cupTexture = SkinLoader.loadPng("cup");
+        cupTexture = SkinLoader.loadPng("cup.png");
         cupColor = Klooni.theme.currentScore.cpy();
         cupArea = new Rectangle();