commit 70688a2333a140eb40120e79fef042513441d732
Author: leszek <leszek@koltunski.pl>
Date:   Thu Oct 12 16:39:02 2023 +0200

    LTR UI elements; rename some of them.

diff --git a/src/main/java/org/distorted/bandaged/BandagedCreatorScreen.java b/src/main/java/org/distorted/bandaged/BandagedCreatorScreen.java
index f4ecd61a..82ac67a6 100644
--- a/src/main/java/org/distorted/bandaged/BandagedCreatorScreen.java
+++ b/src/main/java/org/distorted/bandaged/BandagedCreatorScreen.java
@@ -67,7 +67,7 @@ public class BandagedCreatorScreen implements AdapterView.OnItemSelectedListener
   private void setupBackButton(final BandagedCreatorActivity act)
     {
     LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT,LinearLayout.LayoutParams.MATCH_PARENT);
-    mBackButton = new TransparentImageButton(act,R.drawable.ui_huge_smallback,params);
+    mBackButton = new TransparentImageButton(act,R.drawable.ui_smallback,params);
 
     mBackButton.setOnClickListener( new View.OnClickListener()
       {
@@ -84,7 +84,7 @@ public class BandagedCreatorScreen implements AdapterView.OnItemSelectedListener
   private void setupDoneButton(final BandagedCreatorActivity act)
     {
     LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT,LinearLayout.LayoutParams.MATCH_PARENT);
-    mDoneButton = new TransparentImageButton(act,R.drawable.ui_huge_done,params);
+    mDoneButton = new TransparentImageButton(act,R.drawable.ui_done,params);
 
     mDoneButton.setOnClickListener( new View.OnClickListener()
       {
@@ -102,7 +102,7 @@ public class BandagedCreatorScreen implements AdapterView.OnItemSelectedListener
   private void setupResetButton(final BandagedCreatorActivity act)
     {
     LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT,LinearLayout.LayoutParams.MATCH_PARENT);
-    mResetButton = new TransparentImageButton(act,R.drawable.ui_huge_reset,params);
+    mResetButton = new TransparentImageButton(act,R.drawable.ui_reset,params);
 
     mResetButton.setOnClickListener( new View.OnClickListener()
       {
diff --git a/src/main/java/org/distorted/bandaged/BandagedPlayScreen.java b/src/main/java/org/distorted/bandaged/BandagedPlayScreen.java
index 1b2fd34b..3b96713b 100644
--- a/src/main/java/org/distorted/bandaged/BandagedPlayScreen.java
+++ b/src/main/java/org/distorted/bandaged/BandagedPlayScreen.java
@@ -46,7 +46,7 @@ public class BandagedPlayScreen
   private void setupBackButton(final BandagedPlayActivity act)
     {
     LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT,LinearLayout.LayoutParams.MATCH_PARENT);
-    mBackButton = new TransparentImageButton(act,R.drawable.ui_huge_smallback,params);
+    mBackButton = new TransparentImageButton(act,R.drawable.ui_smallback,params);
 
     mBackButton.setOnClickListener( new View.OnClickListener()
       {
@@ -63,7 +63,7 @@ public class BandagedPlayScreen
   private void setupSolveButton(final BandagedPlayActivity act)
     {
     LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT,LinearLayout.LayoutParams.MATCH_PARENT,1.0f);
-    mSolveButton = new TransparentImageButton(act,R.drawable.ui_huge_cube_solve,params);
+    mSolveButton = new TransparentImageButton(act,R.drawable.ui_cube_solve,params);
 
     mSolveButton.setOnClickListener( new View.OnClickListener()
       {
@@ -82,7 +82,7 @@ public class BandagedPlayScreen
   private void setupScrambleButton(final BandagedPlayActivity act)
     {
     LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT,LinearLayout.LayoutParams.MATCH_PARENT,1.0f);
-    mScrambleButton = new TransparentImageButton(act,R.drawable.ui_huge_cube_scramble,params);
+    mScrambleButton = new TransparentImageButton(act,R.drawable.ui_cube_scramble,params);
 
     mScrambleButton.setOnClickListener( new View.OnClickListener()
       {
diff --git a/src/main/java/org/distorted/config/ConfigScreen.java b/src/main/java/org/distorted/config/ConfigScreen.java
index 6055bd2e..084c8286 100644
--- a/src/main/java/org/distorted/config/ConfigScreen.java
+++ b/src/main/java/org/distorted/config/ConfigScreen.java
@@ -104,7 +104,7 @@ public class ConfigScreen
   private void setupBackButton(final ConfigActivity act)
     {
     LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT,LinearLayout.LayoutParams.MATCH_PARENT);
-    mBackButton = new TransparentImageButton(act,R.drawable.ui_huge_smallback,params);
+    mBackButton = new TransparentImageButton(act,R.drawable.ui_smallback,params);
 
     mBackButton.setOnClickListener( new View.OnClickListener()
       {
@@ -122,7 +122,7 @@ public class ConfigScreen
     {
     final int margin= (int)(height*MARGIN);
     LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT,LinearLayout.LayoutParams.MATCH_PARENT);
-    mObjectButton = new TransparentImageButton(act,R.drawable.ui_huge_cube_menu,params);
+    mObjectButton = new TransparentImageButton(act,R.drawable.ui_cube_menu,params);
 
     mObjectButton.setOnClickListener( new View.OnClickListener()
       {
@@ -214,7 +214,7 @@ public class ConfigScreen
   private void setupPrevButton(final ConfigActivity act)
     {
     LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(0,LinearLayout.LayoutParams.MATCH_PARENT,1.0f);
-    mPrevButton = new TransparentImageButton(act,R.drawable.ui_huge_left,params);
+    mPrevButton = new TransparentImageButton(act,R.drawable.ui_left,params);
 
     mPrevButton.setOnClickListener( new View.OnClickListener()
       {
@@ -233,7 +233,7 @@ public class ConfigScreen
   private void setupNextButton(final ConfigActivity act)
     {
     LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(0,LinearLayout.LayoutParams.MATCH_PARENT,1.0f);
-    mNextButton = new TransparentImageButton(act,R.drawable.ui_huge_right,params);
+    mNextButton = new TransparentImageButton(act,R.drawable.ui_right,params);
 
     mNextButton.setOnClickListener( new View.OnClickListener()
       {
diff --git a/src/main/java/org/distorted/helpers/LockController.java b/src/main/java/org/distorted/helpers/LockController.java
index 891f0811..68488476 100644
--- a/src/main/java/org/distorted/helpers/LockController.java
+++ b/src/main/java/org/distorted/helpers/LockController.java
@@ -52,7 +52,7 @@ public class LockController
 
   private int getLockIcon(boolean locked, boolean red)
     {
-    return locked ? (red? R.drawable.ui_huge_locked_red : R.drawable.ui_huge_locked) : R.drawable.ui_huge_unlocked;
+    return locked ? (red? R.drawable.ui_locked_red : R.drawable.ui_locked) : R.drawable.ui_unlocked;
     }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/src/main/java/org/distorted/helpers/MovesController.java b/src/main/java/org/distorted/helpers/MovesController.java
index 26370e38..8adb8320 100644
--- a/src/main/java/org/distorted/helpers/MovesController.java
+++ b/src/main/java/org/distorted/helpers/MovesController.java
@@ -58,7 +58,7 @@ public class MovesController implements MovesFinished
 
   private int getPrevIcon(boolean on)
     {
-    return on ? R.drawable.ui_huge_cube_back : R.drawable.ui_huge_cube_grey;
+    return on ? R.drawable.ui_cube_back : R.drawable.ui_cube_grey;
     }
 
 //////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/src/main/java/org/distorted/purchase/PurchaseScreen.java b/src/main/java/org/distorted/purchase/PurchaseScreen.java
index 1ecd222e..c760ba04 100644
--- a/src/main/java/org/distorted/purchase/PurchaseScreen.java
+++ b/src/main/java/org/distorted/purchase/PurchaseScreen.java
@@ -34,7 +34,7 @@ public class PurchaseScreen
   private void setupBackButton(final PurchaseActivity act)
     {
     LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT,LinearLayout.LayoutParams.MATCH_PARENT);
-    mBackButton = new TransparentImageButton(act,R.drawable.ui_huge_smallback,params);
+    mBackButton = new TransparentImageButton(act,R.drawable.ui_smallback,params);
 
     mBackButton.setOnClickListener( new View.OnClickListener()
       {
diff --git a/src/main/java/org/distorted/screens/RubikScreenDone.java b/src/main/java/org/distorted/screens/RubikScreenDone.java
index da48c559..5b36efde 100644
--- a/src/main/java/org/distorted/screens/RubikScreenDone.java
+++ b/src/main/java/org/distorted/screens/RubikScreenDone.java
@@ -77,7 +77,7 @@ public class RubikScreenDone extends RubikScreenAbstract
   private void setupBackButton(final RubikActivity act)
     {
     LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT,LinearLayout.LayoutParams.MATCH_PARENT,1.0f);
-    mBackButton = new TransparentImageButton(act,R.drawable.ui_huge_back,params);
+    mBackButton = new TransparentImageButton(act,R.drawable.ui_back,params);
 
     mBackButton.setOnClickListener( new View.OnClickListener()
       {
diff --git a/src/main/java/org/distorted/screens/RubikScreenPattern.java b/src/main/java/org/distorted/screens/RubikScreenPattern.java
index 1ebe11f8..36c72c9c 100644
--- a/src/main/java/org/distorted/screens/RubikScreenPattern.java
+++ b/src/main/java/org/distorted/screens/RubikScreenPattern.java
@@ -133,7 +133,7 @@ public class RubikScreenPattern extends RubikScreenAbstract
   private void setupBackButton(final RubikActivity act)
     {
     LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT,LinearLayout.LayoutParams.MATCH_PARENT,1.0f);
-    mBackButton = new TransparentImageButton(act,R.drawable.ui_huge_back,params);
+    mBackButton = new TransparentImageButton(act,R.drawable.ui_back,params);
 
     mBackButton.setOnClickListener( new View.OnClickListener()
       {
@@ -152,7 +152,7 @@ public class RubikScreenPattern extends RubikScreenAbstract
   private void setupPrevButton(final RubikActivity act)
     {
     LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(0,LinearLayout.LayoutParams.MATCH_PARENT,1.0f);
-    mPrevButton = new TransparentImageButton(act,R.drawable.ui_huge_left,params);
+    mPrevButton = new TransparentImageButton(act,R.drawable.ui_left,params);
 
     mPrevButton.setOnClickListener( new View.OnClickListener()
       {
@@ -173,7 +173,7 @@ public class RubikScreenPattern extends RubikScreenAbstract
   private void setupNextButton(final RubikActivity act)
     {
     LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(0,LinearLayout.LayoutParams.MATCH_PARENT,1.0f);
-    mNextButton = new TransparentImageButton(act,R.drawable.ui_huge_right,params);
+    mNextButton = new TransparentImageButton(act,R.drawable.ui_right,params);
 
     mNextButton.setOnClickListener( new View.OnClickListener()
       {
diff --git a/src/main/java/org/distorted/screens/RubikScreenPlay.java b/src/main/java/org/distorted/screens/RubikScreenPlay.java
index 9c3ec901..f38f9b08 100644
--- a/src/main/java/org/distorted/screens/RubikScreenPlay.java
+++ b/src/main/java/org/distorted/screens/RubikScreenPlay.java
@@ -128,7 +128,7 @@ public class RubikScreenPlay extends RubikScreenBase implements RubikNetwork.Upd
     {
     final int margin  = (int)(width*RubikActivity.SMALL_MARGIN);
     LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(MP,MP,1.0f);
-    mObjButton = new TransparentImageButton(act, R.drawable.ui_huge_cube_menu,params);
+    mObjButton = new TransparentImageButton(act, R.drawable.ui_cube_menu,params);
 
     mObjButton.setOnClickListener( new View.OnClickListener()
       {
@@ -158,7 +158,7 @@ public class RubikScreenPlay extends RubikScreenBase implements RubikNetwork.Upd
   private void setupMenuButton(final RubikActivity act, final float width, final float height)
     {
     LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(MP,MP,1.0f);
-    mMenuButton = new TransparentImageButton(act, R.drawable.ui_huge_menu,params);
+    mMenuButton = new TransparentImageButton(act, R.drawable.ui_menu,params);
 
     mMenuButton.setOnClickListener( new View.OnClickListener()
       {
@@ -253,9 +253,9 @@ public class RubikScreenPlay extends RubikScreenBase implements RubikNetwork.Upd
     ImageButton buttonDow = layout.findViewById(R.id.buttonDow);
     ImageButton buttonInf = layout.findViewById(R.id.buttonInf);
 
-    buttonTut.setImageResource(R.drawable.ui_huge_tutorial);
-    buttonDow.setImageResource(R.drawable.ui_huge_download);
-    buttonInf.setImageResource(R.drawable.ui_huge_info);
+    buttonTut.setImageResource(R.drawable.ui_tutorial);
+    buttonDow.setImageResource(R.drawable.ui_download);
+    buttonInf.setImageResource(R.drawable.ui_info);
 
     TypedValue outValue = new TypedValue();
     act.getTheme().resolveAttribute(android.R.attr.selectableItemBackgroundBorderless, outValue, true);
@@ -308,7 +308,7 @@ public class RubikScreenPlay extends RubikScreenBase implements RubikNetwork.Upd
   void setupSolveButton(final RubikActivity act)
     {
     LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(MP,MP,1.0f);
-    mSolveButton = new TransparentImageButton(act, R.drawable.ui_huge_cube_solve,params);
+    mSolveButton = new TransparentImageButton(act, R.drawable.ui_cube_solve,params);
 
     mSolveButton.setOnClickListener( new View.OnClickListener()
       {
@@ -326,7 +326,7 @@ public class RubikScreenPlay extends RubikScreenBase implements RubikNetwork.Upd
   private void setupScrambleButton(final RubikActivity act)
     {
     LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(MP,MP,1.0f);
-    mScrambleButton = new TransparentImageButton(act, R.drawable.ui_huge_cube_scramble,params);
+    mScrambleButton = new TransparentImageButton(act, R.drawable.ui_cube_scramble,params);
 
     mScrambleButton.setOnClickListener( new View.OnClickListener()
       {
diff --git a/src/main/java/org/distorted/screens/RubikScreenReady.java b/src/main/java/org/distorted/screens/RubikScreenReady.java
index 5aac4eb4..28c1c88f 100644
--- a/src/main/java/org/distorted/screens/RubikScreenReady.java
+++ b/src/main/java/org/distorted/screens/RubikScreenReady.java
@@ -58,7 +58,7 @@ public class RubikScreenReady extends RubikScreenBase
   private void setupBackButton(final RubikActivity act)
     {
     LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT,LinearLayout.LayoutParams.MATCH_PARENT,1.0f);
-    mBackButton = new TransparentImageButton(act,R.drawable.ui_huge_back,params);
+    mBackButton = new TransparentImageButton(act,R.drawable.ui_back,params);
 
     mBackButton.setOnClickListener( new View.OnClickListener()
       {
diff --git a/src/main/java/org/distorted/screens/RubikScreenSolution.java b/src/main/java/org/distorted/screens/RubikScreenSolution.java
index 3eb43b5b..7c91f1eb 100644
--- a/src/main/java/org/distorted/screens/RubikScreenSolution.java
+++ b/src/main/java/org/distorted/screens/RubikScreenSolution.java
@@ -102,7 +102,7 @@ public class RubikScreenSolution extends RubikScreenAbstract implements MovesFin
   private void setupPrevButton(final RubikActivity act)
     {
     LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(0,LinearLayout.LayoutParams.MATCH_PARENT,1.0f);
-    mPrevButton = new TransparentImageButton(act,R.drawable.ui_huge_left,params);
+    mPrevButton = new TransparentImageButton(act,R.drawable.ui_left,params);
 
     mPrevButton.setOnClickListener( new View.OnClickListener()
       {
@@ -121,7 +121,7 @@ public class RubikScreenSolution extends RubikScreenAbstract implements MovesFin
   private void setupNextButton(final RubikActivity act)
     {
     LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(0,LinearLayout.LayoutParams.MATCH_PARENT,1.0f);
-    mNextButton = new TransparentImageButton(act,R.drawable.ui_huge_right,params);
+    mNextButton = new TransparentImageButton(act,R.drawable.ui_right,params);
 
     mNextButton.setOnClickListener( new View.OnClickListener()
       {
@@ -161,7 +161,7 @@ public class RubikScreenSolution extends RubikScreenAbstract implements MovesFin
   private void setupBackButton(final RubikActivity act)
     {
     LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT,LinearLayout.LayoutParams.MATCH_PARENT,1.0f);
-    mBackButton = new TransparentImageButton(act,R.drawable.ui_huge_back,params);
+    mBackButton = new TransparentImageButton(act,R.drawable.ui_back,params);
 
     mBackButton.setOnClickListener( new View.OnClickListener()
       {
diff --git a/src/main/java/org/distorted/screens/RubikScreenSolver.java b/src/main/java/org/distorted/screens/RubikScreenSolver.java
index b50c1942..c6bd1f49 100644
--- a/src/main/java/org/distorted/screens/RubikScreenSolver.java
+++ b/src/main/java/org/distorted/screens/RubikScreenSolver.java
@@ -288,7 +288,7 @@ public class RubikScreenSolver extends RubikScreenAbstract
   private void setupResetButton(final RubikActivity act)
     {
     LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT,LinearLayout.LayoutParams.MATCH_PARENT);
-    mResetButton = new TransparentImageButton(act, R.drawable.ui_huge_reset, params);
+    mResetButton = new TransparentImageButton(act, R.drawable.ui_reset, params);
 
     mResetButton.setOnClickListener( new View.OnClickListener()
       {
@@ -306,7 +306,7 @@ public class RubikScreenSolver extends RubikScreenAbstract
   private void setupSolveButton(final RubikActivity act)
     {
     LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT,LinearLayout.LayoutParams.MATCH_PARENT,1.0f);
-    mSolveButton = new TransparentImageButton(act,R.drawable.ui_huge_solve,params);
+    mSolveButton = new TransparentImageButton(act,R.drawable.ui_solve,params);
 
     mSolveButton.setOnClickListener( new View.OnClickListener()
       {
@@ -329,7 +329,7 @@ public class RubikScreenSolver extends RubikScreenAbstract
   private void setupBackButton(final RubikActivity act)
     {
     LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT,LinearLayout.LayoutParams.MATCH_PARENT,1.0f);
-    mBackButton = new TransparentImageButton(act,R.drawable.ui_huge_back,params);
+    mBackButton = new TransparentImageButton(act,R.drawable.ui_back,params);
 
     mBackButton.setOnClickListener( new View.OnClickListener()
       {
diff --git a/src/main/java/org/distorted/screens/RubikScreenSolving.java b/src/main/java/org/distorted/screens/RubikScreenSolving.java
index 11d27478..5e6f1f49 100644
--- a/src/main/java/org/distorted/screens/RubikScreenSolving.java
+++ b/src/main/java/org/distorted/screens/RubikScreenSolving.java
@@ -83,7 +83,7 @@ public class RubikScreenSolving extends RubikScreenBase
   private void setupBackButton(final RubikActivity act)
     {
     LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT,LinearLayout.LayoutParams.MATCH_PARENT,1.0f);
-    mBackButton = new TransparentImageButton(act,R.drawable.ui_huge_back,params);
+    mBackButton = new TransparentImageButton(act,R.drawable.ui_back,params);
 
     mBackButton.setOnClickListener( new View.OnClickListener()
       {
diff --git a/src/main/java/org/distorted/tutorials/TutorialScreen.java b/src/main/java/org/distorted/tutorials/TutorialScreen.java
index 4fef67ec..ce962fdd 100644
--- a/src/main/java/org/distorted/tutorials/TutorialScreen.java
+++ b/src/main/java/org/distorted/tutorials/TutorialScreen.java
@@ -35,7 +35,7 @@ public class TutorialScreen
   private void setupLockButton(final TutorialActivity act)
     {
     LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT,LinearLayout.LayoutParams.MATCH_PARENT,1.0f);
-    mLockButton = new TransparentImageButton(act,R.drawable.ui_huge_locked,params);
+    mLockButton = new TransparentImageButton(act,R.drawable.ui_locked,params);
 
     mLockButton.setOnClickListener( new View.OnClickListener()
       {
@@ -79,7 +79,7 @@ public class TutorialScreen
   private void setupSolveButton(final TutorialActivity act)
     {
     LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT,LinearLayout.LayoutParams.MATCH_PARENT,1.0f);
-    mSolveButton = new TransparentImageButton(act,R.drawable.ui_huge_cube_solve,params);
+    mSolveButton = new TransparentImageButton(act,R.drawable.ui_cube_solve,params);
 
     mSolveButton.setOnClickListener( new View.OnClickListener()
       {
@@ -97,7 +97,7 @@ public class TutorialScreen
   private void setupScrambleButton(final TutorialActivity act)
     {
     LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT,LinearLayout.LayoutParams.MATCH_PARENT,1.0f);
-    mScrambleButton = new TransparentImageButton(act,R.drawable.ui_huge_cube_scramble,params);
+    mScrambleButton = new TransparentImageButton(act,R.drawable.ui_cube_scramble,params);
 
     mScrambleButton.setOnClickListener( new View.OnClickListener()
       {
@@ -115,7 +115,7 @@ public class TutorialScreen
   private void setupBackButton(final TutorialActivity act)
     {
     LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT,LinearLayout.LayoutParams.MATCH_PARENT,1.0f);
-    mBackButton = new TransparentImageButton(act,R.drawable.ui_huge_smallback,params);
+    mBackButton = new TransparentImageButton(act,R.drawable.ui_smallback,params);
 
     mBackButton.setOnClickListener( new View.OnClickListener()
       {
diff --git a/src/main/res/drawable-ldrtl-nodpi/ui_back.png b/src/main/res/drawable-ldrtl-nodpi/ui_back.png
new file mode 100644
index 00000000..ea61bc1e
Binary files /dev/null and b/src/main/res/drawable-ldrtl-nodpi/ui_back.png differ
diff --git a/src/main/res/drawable-ldrtl-nodpi/ui_cube_back.png b/src/main/res/drawable-ldrtl-nodpi/ui_cube_back.png
new file mode 100644
index 00000000..f250970c
Binary files /dev/null and b/src/main/res/drawable-ldrtl-nodpi/ui_cube_back.png differ
diff --git a/src/main/res/drawable-ldrtl-nodpi/ui_cube_grey.png b/src/main/res/drawable-ldrtl-nodpi/ui_cube_grey.png
new file mode 100644
index 00000000..78393f54
Binary files /dev/null and b/src/main/res/drawable-ldrtl-nodpi/ui_cube_grey.png differ
diff --git a/src/main/res/drawable-ldrtl-nodpi/ui_cube_scramble.png b/src/main/res/drawable-ldrtl-nodpi/ui_cube_scramble.png
new file mode 100644
index 00000000..1dba11ee
Binary files /dev/null and b/src/main/res/drawable-ldrtl-nodpi/ui_cube_scramble.png differ
diff --git a/src/main/res/drawable-ldrtl-nodpi/ui_cube_solve.png b/src/main/res/drawable-ldrtl-nodpi/ui_cube_solve.png
new file mode 100644
index 00000000..85ce4ef8
Binary files /dev/null and b/src/main/res/drawable-ldrtl-nodpi/ui_cube_solve.png differ
diff --git a/src/main/res/drawable-ldrtl-nodpi/ui_huge_back.png b/src/main/res/drawable-ldrtl-nodpi/ui_huge_back.png
deleted file mode 100644
index 5fecd61f..00000000
Binary files a/src/main/res/drawable-ldrtl-nodpi/ui_huge_back.png and /dev/null differ
diff --git a/src/main/res/drawable-ldrtl-nodpi/ui_huge_cube_back.png b/src/main/res/drawable-ldrtl-nodpi/ui_huge_cube_back.png
deleted file mode 100644
index bfcfc5a4..00000000
Binary files a/src/main/res/drawable-ldrtl-nodpi/ui_huge_cube_back.png and /dev/null differ
diff --git a/src/main/res/drawable-ldrtl-nodpi/ui_huge_cube_grey.png b/src/main/res/drawable-ldrtl-nodpi/ui_huge_cube_grey.png
deleted file mode 100644
index f59b6eaf..00000000
Binary files a/src/main/res/drawable-ldrtl-nodpi/ui_huge_cube_grey.png and /dev/null differ
diff --git a/src/main/res/drawable-ldrtl-nodpi/ui_huge_cube_scramble.png b/src/main/res/drawable-ldrtl-nodpi/ui_huge_cube_scramble.png
deleted file mode 100644
index 9c23af10..00000000
Binary files a/src/main/res/drawable-ldrtl-nodpi/ui_huge_cube_scramble.png and /dev/null differ
diff --git a/src/main/res/drawable-ldrtl-nodpi/ui_huge_cube_solve.png b/src/main/res/drawable-ldrtl-nodpi/ui_huge_cube_solve.png
deleted file mode 100644
index f2b5750c..00000000
Binary files a/src/main/res/drawable-ldrtl-nodpi/ui_huge_cube_solve.png and /dev/null differ
diff --git a/src/main/res/drawable-ldrtl-nodpi/ui_huge_left.png b/src/main/res/drawable-ldrtl-nodpi/ui_huge_left.png
deleted file mode 100644
index 64d25b7f..00000000
Binary files a/src/main/res/drawable-ldrtl-nodpi/ui_huge_left.png and /dev/null differ
diff --git a/src/main/res/drawable-ldrtl-nodpi/ui_huge_reset.png b/src/main/res/drawable-ldrtl-nodpi/ui_huge_reset.png
deleted file mode 100644
index cea52c2e..00000000
Binary files a/src/main/res/drawable-ldrtl-nodpi/ui_huge_reset.png and /dev/null differ
diff --git a/src/main/res/drawable-ldrtl-nodpi/ui_huge_right.png b/src/main/res/drawable-ldrtl-nodpi/ui_huge_right.png
deleted file mode 100644
index a5f57b43..00000000
Binary files a/src/main/res/drawable-ldrtl-nodpi/ui_huge_right.png and /dev/null differ
diff --git a/src/main/res/drawable-ldrtl-nodpi/ui_huge_smallback.png b/src/main/res/drawable-ldrtl-nodpi/ui_huge_smallback.png
deleted file mode 100644
index 08dcece0..00000000
Binary files a/src/main/res/drawable-ldrtl-nodpi/ui_huge_smallback.png and /dev/null differ
diff --git a/src/main/res/drawable-ldrtl-nodpi/ui_huge_solve.png b/src/main/res/drawable-ldrtl-nodpi/ui_huge_solve.png
deleted file mode 100644
index e78fc209..00000000
Binary files a/src/main/res/drawable-ldrtl-nodpi/ui_huge_solve.png and /dev/null differ
diff --git a/src/main/res/drawable-ldrtl-nodpi/ui_left.png b/src/main/res/drawable-ldrtl-nodpi/ui_left.png
new file mode 100644
index 00000000..e286ed6e
Binary files /dev/null and b/src/main/res/drawable-ldrtl-nodpi/ui_left.png differ
diff --git a/src/main/res/drawable-ldrtl-nodpi/ui_reset.png b/src/main/res/drawable-ldrtl-nodpi/ui_reset.png
new file mode 100644
index 00000000..f40b1db7
Binary files /dev/null and b/src/main/res/drawable-ldrtl-nodpi/ui_reset.png differ
diff --git a/src/main/res/drawable-ldrtl-nodpi/ui_right.png b/src/main/res/drawable-ldrtl-nodpi/ui_right.png
new file mode 100644
index 00000000..c3d5540f
Binary files /dev/null and b/src/main/res/drawable-ldrtl-nodpi/ui_right.png differ
diff --git a/src/main/res/drawable-ldrtl-nodpi/ui_smallback.png b/src/main/res/drawable-ldrtl-nodpi/ui_smallback.png
new file mode 100644
index 00000000..be0cee9a
Binary files /dev/null and b/src/main/res/drawable-ldrtl-nodpi/ui_smallback.png differ
diff --git a/src/main/res/drawable-ldrtl-nodpi/ui_solve.png b/src/main/res/drawable-ldrtl-nodpi/ui_solve.png
new file mode 100644
index 00000000..e78fc209
Binary files /dev/null and b/src/main/res/drawable-ldrtl-nodpi/ui_solve.png differ
diff --git a/src/main/res/drawable-nodpi/ui_back.png b/src/main/res/drawable-nodpi/ui_back.png
new file mode 100644
index 00000000..d6e5cdc9
Binary files /dev/null and b/src/main/res/drawable-nodpi/ui_back.png differ
diff --git a/src/main/res/drawable-nodpi/ui_cube_back.png b/src/main/res/drawable-nodpi/ui_cube_back.png
new file mode 100644
index 00000000..b8ba4b08
Binary files /dev/null and b/src/main/res/drawable-nodpi/ui_cube_back.png differ
diff --git a/src/main/res/drawable-nodpi/ui_cube_grey.png b/src/main/res/drawable-nodpi/ui_cube_grey.png
new file mode 100644
index 00000000..bb963fcf
Binary files /dev/null and b/src/main/res/drawable-nodpi/ui_cube_grey.png differ
diff --git a/src/main/res/drawable-nodpi/ui_cube_menu.png b/src/main/res/drawable-nodpi/ui_cube_menu.png
new file mode 100644
index 00000000..90d4365a
Binary files /dev/null and b/src/main/res/drawable-nodpi/ui_cube_menu.png differ
diff --git a/src/main/res/drawable-nodpi/ui_cube_scramble.png b/src/main/res/drawable-nodpi/ui_cube_scramble.png
new file mode 100644
index 00000000..85ce4ef8
Binary files /dev/null and b/src/main/res/drawable-nodpi/ui_cube_scramble.png differ
diff --git a/src/main/res/drawable-nodpi/ui_cube_solve.png b/src/main/res/drawable-nodpi/ui_cube_solve.png
new file mode 100644
index 00000000..1dba11ee
Binary files /dev/null and b/src/main/res/drawable-nodpi/ui_cube_solve.png differ
diff --git a/src/main/res/drawable-nodpi/ui_done.png b/src/main/res/drawable-nodpi/ui_done.png
new file mode 100644
index 00000000..bdf301b1
Binary files /dev/null and b/src/main/res/drawable-nodpi/ui_done.png differ
diff --git a/src/main/res/drawable-nodpi/ui_down.png b/src/main/res/drawable-nodpi/ui_down.png
new file mode 100644
index 00000000..4f368b5a
Binary files /dev/null and b/src/main/res/drawable-nodpi/ui_down.png differ
diff --git a/src/main/res/drawable-nodpi/ui_download.png b/src/main/res/drawable-nodpi/ui_download.png
new file mode 100644
index 00000000..b8afb355
Binary files /dev/null and b/src/main/res/drawable-nodpi/ui_download.png differ
diff --git a/src/main/res/drawable-nodpi/ui_huge_back.png b/src/main/res/drawable-nodpi/ui_huge_back.png
deleted file mode 100644
index d6e5cdc9..00000000
Binary files a/src/main/res/drawable-nodpi/ui_huge_back.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ui_huge_cube_back.png b/src/main/res/drawable-nodpi/ui_huge_cube_back.png
deleted file mode 100644
index b8ba4b08..00000000
Binary files a/src/main/res/drawable-nodpi/ui_huge_cube_back.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ui_huge_cube_grey.png b/src/main/res/drawable-nodpi/ui_huge_cube_grey.png
deleted file mode 100644
index bb963fcf..00000000
Binary files a/src/main/res/drawable-nodpi/ui_huge_cube_grey.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ui_huge_cube_menu.png b/src/main/res/drawable-nodpi/ui_huge_cube_menu.png
deleted file mode 100644
index 90d4365a..00000000
Binary files a/src/main/res/drawable-nodpi/ui_huge_cube_menu.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ui_huge_cube_scramble.png b/src/main/res/drawable-nodpi/ui_huge_cube_scramble.png
deleted file mode 100644
index 85ce4ef8..00000000
Binary files a/src/main/res/drawable-nodpi/ui_huge_cube_scramble.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ui_huge_cube_solve.png b/src/main/res/drawable-nodpi/ui_huge_cube_solve.png
deleted file mode 100644
index 1dba11ee..00000000
Binary files a/src/main/res/drawable-nodpi/ui_huge_cube_solve.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ui_huge_done.png b/src/main/res/drawable-nodpi/ui_huge_done.png
deleted file mode 100644
index bdf301b1..00000000
Binary files a/src/main/res/drawable-nodpi/ui_huge_done.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ui_huge_down.png b/src/main/res/drawable-nodpi/ui_huge_down.png
deleted file mode 100644
index 4f368b5a..00000000
Binary files a/src/main/res/drawable-nodpi/ui_huge_down.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ui_huge_download.png b/src/main/res/drawable-nodpi/ui_huge_download.png
deleted file mode 100644
index b8afb355..00000000
Binary files a/src/main/res/drawable-nodpi/ui_huge_download.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ui_huge_info.png b/src/main/res/drawable-nodpi/ui_huge_info.png
deleted file mode 100644
index 0d402b36..00000000
Binary files a/src/main/res/drawable-nodpi/ui_huge_info.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ui_huge_left.png b/src/main/res/drawable-nodpi/ui_huge_left.png
deleted file mode 100644
index 7b712913..00000000
Binary files a/src/main/res/drawable-nodpi/ui_huge_left.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ui_huge_locked.png b/src/main/res/drawable-nodpi/ui_huge_locked.png
deleted file mode 100644
index 0100b374..00000000
Binary files a/src/main/res/drawable-nodpi/ui_huge_locked.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ui_huge_locked_red.png b/src/main/res/drawable-nodpi/ui_huge_locked_red.png
deleted file mode 100644
index c0c80adc..00000000
Binary files a/src/main/res/drawable-nodpi/ui_huge_locked_red.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ui_huge_menu.png b/src/main/res/drawable-nodpi/ui_huge_menu.png
deleted file mode 100644
index 1ee04b77..00000000
Binary files a/src/main/res/drawable-nodpi/ui_huge_menu.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ui_huge_reset.png b/src/main/res/drawable-nodpi/ui_huge_reset.png
deleted file mode 100644
index f40b1db7..00000000
Binary files a/src/main/res/drawable-nodpi/ui_huge_reset.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ui_huge_right.png b/src/main/res/drawable-nodpi/ui_huge_right.png
deleted file mode 100644
index c1da12a2..00000000
Binary files a/src/main/res/drawable-nodpi/ui_huge_right.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ui_huge_smallback.png b/src/main/res/drawable-nodpi/ui_huge_smallback.png
deleted file mode 100644
index f650ff99..00000000
Binary files a/src/main/res/drawable-nodpi/ui_huge_smallback.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ui_huge_solve.png b/src/main/res/drawable-nodpi/ui_huge_solve.png
deleted file mode 100644
index 9cb3cda5..00000000
Binary files a/src/main/res/drawable-nodpi/ui_huge_solve.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ui_huge_tutorial.png b/src/main/res/drawable-nodpi/ui_huge_tutorial.png
deleted file mode 100644
index 01f95617..00000000
Binary files a/src/main/res/drawable-nodpi/ui_huge_tutorial.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ui_huge_unlocked.png b/src/main/res/drawable-nodpi/ui_huge_unlocked.png
deleted file mode 100644
index 3a27b8b2..00000000
Binary files a/src/main/res/drawable-nodpi/ui_huge_unlocked.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ui_info.png b/src/main/res/drawable-nodpi/ui_info.png
new file mode 100644
index 00000000..0d402b36
Binary files /dev/null and b/src/main/res/drawable-nodpi/ui_info.png differ
diff --git a/src/main/res/drawable-nodpi/ui_left.png b/src/main/res/drawable-nodpi/ui_left.png
new file mode 100644
index 00000000..7b712913
Binary files /dev/null and b/src/main/res/drawable-nodpi/ui_left.png differ
diff --git a/src/main/res/drawable-nodpi/ui_locked.png b/src/main/res/drawable-nodpi/ui_locked.png
new file mode 100644
index 00000000..0100b374
Binary files /dev/null and b/src/main/res/drawable-nodpi/ui_locked.png differ
diff --git a/src/main/res/drawable-nodpi/ui_locked_red.png b/src/main/res/drawable-nodpi/ui_locked_red.png
new file mode 100644
index 00000000..c0c80adc
Binary files /dev/null and b/src/main/res/drawable-nodpi/ui_locked_red.png differ
diff --git a/src/main/res/drawable-nodpi/ui_menu.png b/src/main/res/drawable-nodpi/ui_menu.png
new file mode 100644
index 00000000..1ee04b77
Binary files /dev/null and b/src/main/res/drawable-nodpi/ui_menu.png differ
diff --git a/src/main/res/drawable-nodpi/ui_reset.png b/src/main/res/drawable-nodpi/ui_reset.png
new file mode 100644
index 00000000..f40b1db7
Binary files /dev/null and b/src/main/res/drawable-nodpi/ui_reset.png differ
diff --git a/src/main/res/drawable-nodpi/ui_right.png b/src/main/res/drawable-nodpi/ui_right.png
new file mode 100644
index 00000000..c1da12a2
Binary files /dev/null and b/src/main/res/drawable-nodpi/ui_right.png differ
diff --git a/src/main/res/drawable-nodpi/ui_smallback.png b/src/main/res/drawable-nodpi/ui_smallback.png
new file mode 100644
index 00000000..f650ff99
Binary files /dev/null and b/src/main/res/drawable-nodpi/ui_smallback.png differ
diff --git a/src/main/res/drawable-nodpi/ui_solve.png b/src/main/res/drawable-nodpi/ui_solve.png
new file mode 100644
index 00000000..9cb3cda5
Binary files /dev/null and b/src/main/res/drawable-nodpi/ui_solve.png differ
diff --git a/src/main/res/drawable-nodpi/ui_tutorial.png b/src/main/res/drawable-nodpi/ui_tutorial.png
new file mode 100644
index 00000000..01f95617
Binary files /dev/null and b/src/main/res/drawable-nodpi/ui_tutorial.png differ
diff --git a/src/main/res/drawable-nodpi/ui_unlocked.png b/src/main/res/drawable-nodpi/ui_unlocked.png
new file mode 100644
index 00000000..3a27b8b2
Binary files /dev/null and b/src/main/res/drawable-nodpi/ui_unlocked.png differ
diff --git a/src/main/res/drawable/ui_huge_spinner.xml b/src/main/res/drawable/ui_huge_spinner.xml
deleted file mode 100644
index 59342199..00000000
--- a/src/main/res/drawable/ui_huge_spinner.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <layer-list>
-            <item>
-                <shape android:shape="rectangle">
-                    <solid android:color="@color/light_grey" />
-                    <corners android:radius="6dip" />
-                    <stroke
-                        android:color="@color/grey"
-                        android:width="2dp"/>
-                </shape>
-            </item>
-            <item >
-                <bitmap android:gravity="center_vertical|right" android:src="@drawable/ui_huge_down"/>
-            </item>
-        </layer-list>
-    </item>
-</selector>
\ No newline at end of file
diff --git a/src/main/res/drawable/ui_spinner.xml b/src/main/res/drawable/ui_spinner.xml
new file mode 100644
index 00000000..9f2beb84
--- /dev/null
+++ b/src/main/res/drawable/ui_spinner.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <layer-list>
+            <item>
+                <shape android:shape="rectangle">
+                    <solid android:color="@color/light_grey" />
+                    <corners android:radius="6dip" />
+                    <stroke
+                        android:color="@color/grey"
+                        android:width="2dp"/>
+                </shape>
+            </item>
+            <item >
+                <bitmap android:gravity="center_vertical|right" android:src="@drawable/ui_down"/>
+            </item>
+        </layer-list>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/src/main/res/layout/non_free_object.xml b/src/main/res/layout/non_free_object.xml
index 56b4e385..31b725d5 100644
--- a/src/main/res/layout/non_free_object.xml
+++ b/src/main/res/layout/non_free_object.xml
@@ -18,6 +18,6 @@
             android:adjustViewBounds="true"
             android:paddingTop="-10dp"
             android:scaleType="fitStart"
-            android:src="@drawable/ui_huge_locked"/>
+            android:src="@drawable/ui_locked"/>
 
     </FrameLayout>
\ No newline at end of file