diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/BaseMainActivity.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/BaseMainActivity.java
index d66539ddb..3825ccfeb 100644
--- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/BaseMainActivity.java
+++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/BaseMainActivity.java
@@ -210,7 +210,6 @@ public class BaseMainActivity extends LoggableActivity {
             this.debugText = findViewById(R.id.content_text_debug);
 
             this.minecraftGLView = findViewById(R.id.main_game_render_view);
-           
             // toggleGui(null);
             this.drawerLayout.closeDrawers();
 /*
diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/PojavLoginActivity.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/PojavLoginActivity.java
index 19f6a6f83..b00a5e119 100644
--- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/PojavLoginActivity.java
+++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/PojavLoginActivity.java
@@ -62,11 +62,12 @@ public class PojavLoginActivity extends BaseActivity
         super.onCreate(savedInstanceState); // false);
         
         Tools.updateWindowSize(this);
-        
+        /*
         ControlData.pixelOf2dp = (int) Tools.dpToPx(2);
         ControlData.pixelOf30dp = (int) Tools.dpToPx(30);
         ControlData.pixelOf50dp = (int) Tools.dpToPx(50);
         ControlData.pixelOf80dp = (int) Tools.dpToPx(80);
+         */
         ControlData[] specialButtons = ControlData.getSpecialButtons();
         specialButtons[0].name = getString(R.string.control_keyboard);
         specialButtons[1].name = getString(R.string.control_toggle);
diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/ControlData.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/ControlData.java
index a9bcc27c7..5816bd39c 100644
--- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/ControlData.java
+++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/ControlData.java
@@ -9,11 +9,12 @@ import org.lwjgl.glfw.*;
 
 public class ControlData implements Cloneable
 {
-    public static int pixelOf2dp;
-    public static int pixelOf30dp;
-    public static int pixelOf50dp;
+    /*
+    public static int pixelOf2dp = (int) Tools.dpToPx(2);
+    public static int pixelOf30dp = (int) Tools.dpToPx(30);
+    public static int pixelOf50dp = Tools.dpToPx(50);;
     public static int pixelOf80dp;
-
+    */
     public static final int SPECIALBTN_KEYBOARD = -1;
     public static final int SPECIALBTN_TOGGLECTRL = -2;
     public static final int SPECIALBTN_MOUSEPRI = -3;
@@ -73,8 +74,8 @@ public class ControlData implements Cloneable
     public String name;
     public float x;
     public float y;
-    public float width = pixelOf50dp;
-    public float height = pixelOf50dp;
+    public float width;
+    public float height;
     public int keycode;
     public int transparency;
     @Deprecated
@@ -93,7 +94,7 @@ public class ControlData implements Cloneable
     }
 
     public ControlData(String name, int keycode, float x, float y) {
-        this(name, keycode, x, y, pixelOf50dp, pixelOf50dp);
+        this(name, keycode, x, y, Tools.dpToPx(50), Tools.dpToPx(50));
     }
 
     public ControlData(android.content.Context ctx, int resId, int keycode, float x, float y, boolean isSquare) {
@@ -101,7 +102,7 @@ public class ControlData implements Cloneable
     }
 
     public ControlData(String name, int keycode, float x, float y, boolean isSquare) {
-        this(name, keycode, x, y, isSquare ? pixelOf50dp : pixelOf80dp, isSquare ? pixelOf50dp : pixelOf30dp);
+        this(name, keycode, x, y, isSquare ? Tools.dpToPx(50) : Tools.dpToPx(80), isSquare ? Tools.dpToPx(50) : Tools.dpToPx(30));
     }
 
     public ControlData(String name, int keycode, float x, float y, float width, float height) {
@@ -110,7 +111,7 @@ public class ControlData implements Cloneable
     }
 
     public ControlData(String name, int keycode, String dynamicX, String dynamicY) {
-        this(name, keycode, dynamicX, dynamicY, pixelOf50dp, pixelOf50dp, false);
+        this(name, keycode, dynamicX, dynamicY, Tools.dpToPx(50), Tools.dpToPx(50), false);
     }
 
     public ControlData(android.content.Context ctx, int resId, int keycode, String dynamicX, String dynamicY, boolean isSquare) {
@@ -118,7 +119,7 @@ public class ControlData implements Cloneable
     }
 
     public ControlData(String name, int keycode, String dynamicX, String dynamicY, boolean isSquare) {
-        this(name, keycode, dynamicX, dynamicY, isSquare ? pixelOf50dp : pixelOf80dp, isSquare ? pixelOf50dp : pixelOf30dp, false);
+        this(name, keycode, dynamicX, dynamicY, isSquare ? Tools.dpToPx(50) : Tools.dpToPx(80), isSquare ? Tools.dpToPx(50) : Tools.dpToPx(30), false);
     }
 
     public ControlData(String name, int keycode, String dynamicX, String dynamicY, float width, float height, boolean isToggle) {
@@ -156,7 +157,7 @@ public class ControlData implements Cloneable
         keyValueMap.put("height", Float.toString(height));
         keyValueMap.put("screen_width", Integer.toString(CallbackBridge.windowWidth));
         keyValueMap.put("screen_height", Integer.toString(CallbackBridge.windowHeight));
-        keyValueMap.put("margin", Integer.toString(pixelOf2dp));
+        keyValueMap.put("margin", Integer.toString((int) Tools.dpToPx(2)));
         
         // Insert value to ${variable}
         String insertedPos = JSONUtils.insertSingleJSONValue(dynamicPos, keyValueMap);