diff --git a/app_pojavlauncher/src/main/res/layout/fragment_file_selector.xml b/app_pojavlauncher/src/main/res/layout/fragment_file_selector.xml
index d7d5f7d27..b8e313fee 100644
--- a/app_pojavlauncher/src/main/res/layout/fragment_file_selector.xml
+++ b/app_pojavlauncher/src/main/res/layout/fragment_file_selector.xml
@@ -21,28 +21,31 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginVertical="@dimen/_16sdp"
-        android:text="Select Folder"
+        android:layout_marginStart="@dimen/padding_medium"
+        android:text="@string/folder_fragment_select"
 
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toEndOf="@+id/file_selector_create_folder"
-        app:layout_constraintWidth_percent="0.45" />
+         />
 
     <com.kdt.mcgui.MineButton
         android:id="@+id/file_selector_create_folder"
-        android:layout_width="185dp"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginVertical="@dimen/_16sdp"
+        android:layout_marginEnd="@dimen/padding_medium"
 
-
-        android:text="Create folder"
+        android:text="@string/folder_fragment_create"
 
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@+id/file_selector_select_folder"
         app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintHorizontal_chainStyle="spread_inside"
+
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintWidth_percent="0.45" />
+         />
 
     <TextView
         android:id="@+id/file_selector_current_path"
diff --git a/app_pojavlauncher/src/main/res/layout/fragment_launcher.xml b/app_pojavlauncher/src/main/res/layout/fragment_launcher.xml
index 7b0b6cea2..6cb31bd99 100644
--- a/app_pojavlauncher/src/main/res/layout/fragment_launcher.xml
+++ b/app_pojavlauncher/src/main/res/layout/fragment_launcher.xml
@@ -63,7 +63,7 @@
 		android:background="@android:color/transparent"
 		android:drawableEnd="@drawable/spinner_arrow"
 
-		app:drawableEndSize="@dimen/_12sdp"
+		app:drawableEndSize="@dimen/padding_heavy"
 		app:drawableStartIntegerScaling="true"
 		app:drawableStartSize="@dimen/_36sdp"
 		app:drawableEndPadding="@dimen/_1sdp"
diff --git a/app_pojavlauncher/src/main/res/layout/fragment_local_login.xml b/app_pojavlauncher/src/main/res/layout/fragment_local_login.xml
index fdc41b8f2..fcc8cd191 100644
--- a/app_pojavlauncher/src/main/res/layout/fragment_local_login.xml
+++ b/app_pojavlauncher/src/main/res/layout/fragment_local_login.xml
@@ -52,7 +52,7 @@
         android:layout_width="0dp"
         android:layout_height="@dimen/_42sdp"
         android:layout_marginHorizontal="@dimen/_25sdp"
-        android:layout_marginTop="@dimen/_12sdp"
+        android:layout_marginTop="@dimen/padding_heavy"
         android:onClick="loginMC"
         android:text="@string/login_online_login_label"
 
diff --git a/app_pojavlauncher/src/main/res/layout/fragment_profile_editor.xml b/app_pojavlauncher/src/main/res/layout/fragment_profile_editor.xml
index dd8cce4d1..435b4d8f1 100644
--- a/app_pojavlauncher/src/main/res/layout/fragment_profile_editor.xml
+++ b/app_pojavlauncher/src/main/res/layout/fragment_profile_editor.xml
@@ -27,14 +27,14 @@
             android:id="@+id/vprof_editor_profile_name"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/_24sdp"
+            android:layout_marginTop="@dimen/padding_extra_large"
             android:background="@drawable/background_line"
             android:textSize="@dimen/_13ssp"
 
             android:ems="10"
             android:hint="@string/unnamed"
             android:inputType="textPersonName"
-            android:paddingHorizontal="@dimen/_12sdp"
+            android:paddingHorizontal="@dimen/padding_heavy"
             app:layout_constraintTop_toTopOf="parent" />
 
 
@@ -51,10 +51,10 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginTop="32dp"
-            android:layout_marginEnd="@dimen/_4sdp"
+            android:layout_marginEnd="@dimen/padding_medium"
             android:background="@drawable/background_line"
             android:hint="@string/version_select_hint"
-            android:paddingHorizontal="@dimen/_12sdp"
+            android:paddingHorizontal="@dimen/padding_heavy"
             android:textSize="@dimen/_13ssp"
 
             app:layout_constraintEnd_toStartOf="@+id/vprof_editor_version_button"
@@ -86,11 +86,11 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginTop="32dp"
-            android:layout_marginEnd="@dimen/_4sdp"
+            android:layout_marginEnd="@dimen/padding_medium"
 
             android:background="@drawable/background_line"
             android:hint="@string/use_global_default"
-            android:paddingHorizontal="@dimen/_12sdp"
+            android:paddingHorizontal="@dimen/padding_heavy"
             android:textSize="@dimen/_13ssp"
 
             app:layout_constraintEnd_toStartOf="@id/vprof_editor_ctrl_button"
@@ -127,7 +127,7 @@
             android:ems="10"
             android:hint="@string/use_global_default"
             android:inputType="text"
-            android:paddingHorizontal="@dimen/_12sdp"
+            android:paddingHorizontal="@dimen/padding_heavy"
             android:textSize="@dimen/_13ssp"
 
             app:layout_constraintTop_toBottomOf="@+id/vprof_editor_ctrl_spinner" />
@@ -147,12 +147,12 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginTop="32dp"
-            android:layout_marginEnd="@dimen/_4sdp"
+            android:layout_marginEnd="@dimen/padding_medium"
             android:background="@drawable/background_line"
             android:ems="10"
 
             android:hint=".minecraft"
-            android:paddingHorizontal="@dimen/_12sdp"
+            android:paddingHorizontal="@dimen/padding_heavy"
             android:textSize="@dimen/_13ssp"
 
             app:layout_constraintEnd_toStartOf="@id/vprof_editor_path_button"
@@ -240,24 +240,25 @@
             android:layout_height="wrap_content"
             android:layout_marginVertical="26dp"
             android:text="@string/global_save"
+            android:layout_marginEnd="@dimen/padding_medium"
             app:layout_constraintEnd_toStartOf="@+id/vprof_editor_delete_button"
 
             app:layout_constraintHorizontal_bias="0.5"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/vprof_editor_profile_renderer"
-            app:layout_constraintWidth_percent="0.45" />
+             />
 
         <com.kdt.mcgui.MineButton
             android:id="@+id/vprof_editor_delete_button"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-
+            android:layout_marginStart="@dimen/padding_medium"
             android:text="@string/global_delete"
             app:layout_constraintEnd_toEndOf="parent"
 
             app:layout_constraintHorizontal_bias="0.5"
             app:layout_constraintStart_toEndOf="@+id/vprof_editor_save_button"
             app:layout_constraintTop_toTopOf="@+id/vprof_editor_save_button"
-            app:layout_constraintWidth_percent="0.45" />
+             />
     </androidx.constraintlayout.widget.ConstraintLayout>
 </ScrollView>
\ No newline at end of file
diff --git a/app_pojavlauncher/src/main/res/layout/item_multirt_runtime.xml b/app_pojavlauncher/src/main/res/layout/item_multirt_runtime.xml
index 47412e774..55e28fa8f 100644
--- a/app_pojavlauncher/src/main/res/layout/item_multirt_runtime.xml
+++ b/app_pojavlauncher/src/main/res/layout/item_multirt_runtime.xml
@@ -45,7 +45,7 @@
         android:layout_width="@dimen/_35sdp"
         android:layout_height="0dp"
         android:background="?attr/selectableItemBackground"
-        android:paddingVertical="@dimen/_12sdp"
+        android:paddingVertical="@dimen/padding_heavy"
         android:scaleType="fitCenter"
 
         android:src="@drawable/ic_menu_delete_forever"
diff --git a/app_pojavlauncher/src/main/res/layout/spinner_mc_version.xml b/app_pojavlauncher/src/main/res/layout/spinner_mc_version.xml
index ddfa8e501..8a39fe514 100644
--- a/app_pojavlauncher/src/main/res/layout/spinner_mc_version.xml
+++ b/app_pojavlauncher/src/main/res/layout/spinner_mc_version.xml
@@ -8,6 +8,6 @@
     android:fadeScrollbars="false"
     android:scrollbarThumbVertical="@color/minebutton_color"
     android:paddingVertical="@dimen/_14sdp"
-    android:scrollbarSize="@dimen/_4sdp"
+    android:scrollbarSize="@dimen/padding_medium"
     android:background="@color/background_bottom_bar"
     android:divider="@null" />
\ No newline at end of file
diff --git a/app_pojavlauncher/src/main/res/layout/view_progress.xml b/app_pojavlauncher/src/main/res/layout/view_progress.xml
index 767ac4209..2e7948296 100644
--- a/app_pojavlauncher/src/main/res/layout/view_progress.xml
+++ b/app_pojavlauncher/src/main/res/layout/view_progress.xml
@@ -37,8 +37,8 @@
 
     <ImageView
         android:id="@+id/progress_flip_arrow"
-        android:layout_width="@dimen/_24sdp"
-        android:layout_height="@dimen/_24sdp"
+        android:layout_width="@dimen/padding_extra_large"
+        android:layout_height="@dimen/padding_extra_large"
         android:layout_marginEnd="@dimen/_8sdp"
         app:layout_constraintBottom_toBottomOf="@id/progress_generic_progressbar"
         app:layout_constraintEnd_toEndOf="parent"
@@ -51,8 +51,8 @@
         android:layout_height="wrap_content"
         android:orientation="vertical"
         android:visibility="gone"
-        android:paddingHorizontal="@dimen/_12sdp"
-        android:paddingTop="@dimen/_12sdp"
+        android:paddingHorizontal="@dimen/padding_heavy"
+        android:paddingTop="@dimen/padding_heavy"
         android:weightSum="3"
 
 
diff --git a/app_pojavlauncher/src/main/res/values/strings.xml b/app_pojavlauncher/src/main/res/values/strings.xml
index 6c846ba00..b6bb0dcc0 100644
--- a/app_pojavlauncher/src/main/res/values/strings.xml
+++ b/app_pojavlauncher/src/main/res/values/strings.xml
@@ -332,6 +332,8 @@
     <string name="notification_game_runs">The game is running!</string>
     <string name="folder_dialog_create">Create</string>
     <string name="folder_dialog_insert_name">Insert folder name</string>
+    <string name="folder_fragment_create">Create folder</string>
+    <string name="folder_fragment_select">Select Folder</string>
     <string name="main_login_done">Login done</string>
     <string name="main_add_account">Add account</string>
     <string name="tasks_ongoing">Tasks are in progress, please wait</string>