diff --git a/app_pojavlauncher/src/main/AndroidManifest.xml b/app_pojavlauncher/src/main/AndroidManifest.xml
index d8fe8db22..28c2ea9e0 100644
--- a/app_pojavlauncher/src/main/AndroidManifest.xml
+++ b/app_pojavlauncher/src/main/AndroidManifest.xml
@@ -59,12 +59,12 @@
         </activity>
 
         <activity
-            android:theme="@style/MenuDialog"
+            android:theme="@style/Theme.AppCompat.DayNight.Dialog"
             android:screenOrientation="sensorLandscape"
             android:name=".FatalErrorActivity"
             android:configChanges="keyboardHidden|orientation|screenSize|keyboard|navigation"/>
         <activity
-            android:theme="@style/MenuDialog"
+            android:theme="@style/Theme.AppCompat.DayNight.Dialog"
             android:screenOrientation="sensorLandscape"
             android:name=".ExitActivity"
             android:configChanges="keyboardHidden|orientation|screenSize|keyboard|navigation"/>
diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/JAssets.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/JAssets.java
index 684bd6bcc..2f166583d 100644
--- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/JAssets.java
+++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/JAssets.java
@@ -1,9 +1,11 @@
 package net.kdt.pojavlaunch;
 
+import com.google.gson.annotations.SerializedName;
+
 import java.util.Map;
 
 public class JAssets {
-    public boolean mapToResources;
+    @SerializedName("map_to_resources") public boolean mapToResources;
     public Map<String, JAssetInfo> objects;
 }
 
diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/handleview/HandleView.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/handleview/HandleView.java
index 075274dc8..4f7a7b4b3 100644
--- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/handleview/HandleView.java
+++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/handleview/HandleView.java
@@ -31,7 +31,6 @@ import net.kdt.pojavlaunch.customcontrols.buttons.ControlButton;
 
 public abstract class HandleView extends View implements ViewPositionListener, View.OnLongClickListener {
     protected Drawable mDrawable;
-    protected Drawable mDrawableLtr;
     protected Drawable mDrawableRtl;
     private final PopupWindow mContainer;
     // Position with respect to the parent TextView
@@ -92,8 +91,7 @@ public abstract class HandleView extends View implements ViewPositionListener, V
         mContainer.setWindowLayoutType(WindowManager.LayoutParams.TYPE_APPLICATION_SUB_PANEL);
         mContainer.setContentView(this);
 
-        mDrawableLtr = view.getContext().getDrawable(R.drawable.text_select_handle_left_material);
-        mDrawableRtl = view.getContext().getDrawable(R.drawable.text_select_handle_right_material);
+        mDrawableRtl = view.getContext().getDrawable(R.drawable.view_handle);
         mMinSize = view.getContext().getResources().getDimensionPixelSize(R.dimen.text_handle_min_size);
 
         setOnLongClickListener(this);
@@ -201,7 +199,7 @@ public abstract class HandleView extends View implements ViewPositionListener, V
     protected void updateDrawable() {
         // final int offset = getCurrentCursorOffset();
         final boolean isRtlCharAtOffset = true; // mView.getLayout().isRtlCharAt(offset);
-        mDrawable = isRtlCharAtOffset ? mDrawableRtl : mDrawableLtr;
+        mDrawable = mDrawableRtl; //isRtlCharAtOffset ? mDrawableRtl : mDrawableLtr;
         mHotspotX = getHotspotX(mDrawable, isRtlCharAtOffset);
         mHorizontalGravity = getHorizontalGravity(isRtlCharAtOffset);
     }
diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/prefs/PerVersionConfigDialog.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/prefs/PerVersionConfigDialog.java
index eb14119fc..d98c03407 100644
--- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/prefs/PerVersionConfigDialog.java
+++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/prefs/PerVersionConfigDialog.java
@@ -17,7 +17,10 @@ import net.kdt.pojavlaunch.multirt.Runtime;
 import net.kdt.pojavlaunch.value.PerVersionConfig;
 
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
 import java.util.List;
 
 public class PerVersionConfigDialog{
@@ -38,7 +41,8 @@ public class PerVersionConfigDialog{
         mJvmSpinner = mRootView.findViewById(R.id.pvc_javaVm);
         mRendererSpinner = mRootView.findViewById(R.id.pvc_renderer);
 
-        List<String> renderList = Arrays.asList(mContext.getResources().getStringArray(R.array.renderer));
+        ArrayList<String> renderList = new ArrayList<>(5);
+        Collections.addAll(renderList, mContext.getResources().getStringArray(R.array.renderer));
         renderList.add("Default");
         mRendererNames = Arrays.asList(mContext.getResources().getStringArray(R.array.renderer_values));
         mRendererSpinner.setAdapter(new ArrayAdapter<>(mContext, android.R.layout.simple_spinner_dropdown_item, renderList));
diff --git a/app_pojavlauncher/src/main/res/anim/translate_left_side.xml b/app_pojavlauncher/src/main/res/anim/translate_left_side.xml
deleted file mode 100644
index 962be1cc6..000000000
--- a/app_pojavlauncher/src/main/res/anim/translate_left_side.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<translate xmlns:android="http://schemas.android.com/apk/res/android"
-    android:duration="300"
-    android:fromXDelta="100%"
-    android:toXDelta="0%"/>
diff --git a/app_pojavlauncher/src/main/res/anim/translate_right_side.xml b/app_pojavlauncher/src/main/res/anim/translate_right_side.xml
deleted file mode 100644
index 607d4f8d0..000000000
--- a/app_pojavlauncher/src/main/res/anim/translate_right_side.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<translate xmlns:android="http://schemas.android.com/apk/res/android"
-    android:fromXDelta="0%" android:toXDelta="100%"
-    android:fromYDelta="0%" android:toYDelta="0%"
-    android:duration="300"/>
diff --git a/app_pojavlauncher/src/main/res/drawable-hdpi/ic_flatstyle.png b/app_pojavlauncher/src/main/res/drawable-hdpi/ic_flatstyle.png
deleted file mode 100644
index 777730532..000000000
Binary files a/app_pojavlauncher/src/main/res/drawable-hdpi/ic_flatstyle.png and /dev/null differ
diff --git a/app_pojavlauncher/src/main/res/drawable-hdpi/ic_map_rmb.png b/app_pojavlauncher/src/main/res/drawable-hdpi/ic_map_rmb.png
deleted file mode 100644
index 5bdaa3296..000000000
Binary files a/app_pojavlauncher/src/main/res/drawable-hdpi/ic_map_rmb.png and /dev/null differ
diff --git a/app_pojavlauncher/src/main/res/drawable-hdpi/ic_disable_gestures.png b/app_pojavlauncher/src/main/res/drawable-hdpi/ic_setting_disable_gestures.png
similarity index 100%
rename from app_pojavlauncher/src/main/res/drawable-hdpi/ic_disable_gestures.png
rename to app_pojavlauncher/src/main/res/drawable-hdpi/ic_setting_disable_gestures.png
diff --git a/app_pojavlauncher/src/main/res/drawable-hdpi/freeform_opt.png b/app_pojavlauncher/src/main/res/drawable-hdpi/ic_setting_freeform.png
similarity index 100%
rename from app_pojavlauncher/src/main/res/drawable-hdpi/freeform_opt.png
rename to app_pojavlauncher/src/main/res/drawable-hdpi/ic_setting_freeform.png
diff --git a/app_pojavlauncher/src/main/res/drawable-hdpi/ic_lib_check.png b/app_pojavlauncher/src/main/res/drawable-hdpi/ic_setting_lib_check.png
similarity index 100%
rename from app_pojavlauncher/src/main/res/drawable-hdpi/ic_lib_check.png
rename to app_pojavlauncher/src/main/res/drawable-hdpi/ic_setting_lib_check.png
diff --git a/app_pojavlauncher/src/main/res/drawable-hdpi/ic_auto_ram.png b/app_pojavlauncher/src/main/res/drawable-hdpi/ic_setting_ram.png
similarity index 100%
rename from app_pojavlauncher/src/main/res/drawable-hdpi/ic_auto_ram.png
rename to app_pojavlauncher/src/main/res/drawable-hdpi/ic_setting_ram.png
diff --git a/app_pojavlauncher/src/main/res/drawable-hdpi/tap_len.png b/app_pojavlauncher/src/main/res/drawable-hdpi/ic_setting_tap_length.png
old mode 100755
new mode 100644
similarity index 100%
rename from app_pojavlauncher/src/main/res/drawable-hdpi/tap_len.png
rename to app_pojavlauncher/src/main/res/drawable-hdpi/ic_setting_tap_length.png
diff --git a/app_pojavlauncher/src/main/res/drawable-hdpi/text_select_handle_left_mtrl_alpha.png b/app_pojavlauncher/src/main/res/drawable-hdpi/text_select_handle_left_mtrl_alpha.png
deleted file mode 100644
index 9cdc25b45..000000000
Binary files a/app_pojavlauncher/src/main/res/drawable-hdpi/text_select_handle_left_mtrl_alpha.png and /dev/null differ
diff --git a/app_pojavlauncher/src/main/res/drawable-hdpi/text_select_handle_right_mtrl_alpha.png b/app_pojavlauncher/src/main/res/drawable-hdpi/text_select_handle_right_mtrl_alpha.png
deleted file mode 100644
index 276d48091..000000000
Binary files a/app_pojavlauncher/src/main/res/drawable-hdpi/text_select_handle_right_mtrl_alpha.png and /dev/null differ
diff --git a/app_pojavlauncher/src/main/res/drawable-mdpi/btn_scale.png b/app_pojavlauncher/src/main/res/drawable-mdpi/ic_setting_btn_scale.png
old mode 100755
new mode 100644
similarity index 100%
rename from app_pojavlauncher/src/main/res/drawable-mdpi/btn_scale.png
rename to app_pojavlauncher/src/main/res/drawable-mdpi/ic_setting_btn_scale.png
diff --git a/app_pojavlauncher/src/main/res/drawable-mdpi/jre_args.png b/app_pojavlauncher/src/main/res/drawable-mdpi/ic_setting_jre_args.png
old mode 100755
new mode 100644
similarity index 100%
rename from app_pojavlauncher/src/main/res/drawable-mdpi/jre_args.png
rename to app_pojavlauncher/src/main/res/drawable-mdpi/ic_setting_jre_args.png
diff --git a/app_pojavlauncher/src/main/res/drawable-mdpi/mouse_pointer_1.png b/app_pojavlauncher/src/main/res/drawable-mdpi/ic_setting_mouse_pointer.png
old mode 100755
new mode 100644
similarity index 100%
rename from app_pojavlauncher/src/main/res/drawable-mdpi/mouse_pointer_1.png
rename to app_pojavlauncher/src/main/res/drawable-mdpi/ic_setting_mouse_pointer.png
diff --git a/app_pojavlauncher/src/main/res/drawable-mdpi/rm_jre.png b/app_pojavlauncher/src/main/res/drawable-mdpi/rm_jre.png
deleted file mode 100755
index dec16982a..000000000
Binary files a/app_pojavlauncher/src/main/res/drawable-mdpi/rm_jre.png and /dev/null differ
diff --git a/app_pojavlauncher/src/main/res/drawable-mdpi/text_select_handle_left_mtrl_alpha.png b/app_pojavlauncher/src/main/res/drawable-mdpi/text_select_handle_left_mtrl_alpha.png
deleted file mode 100644
index 95c0168cd..000000000
Binary files a/app_pojavlauncher/src/main/res/drawable-mdpi/text_select_handle_left_mtrl_alpha.png and /dev/null differ
diff --git a/app_pojavlauncher/src/main/res/drawable-mdpi/text_select_handle_right_mtrl_alpha.png b/app_pojavlauncher/src/main/res/drawable-mdpi/text_select_handle_right_mtrl_alpha.png
deleted file mode 100644
index 569332abf..000000000
Binary files a/app_pojavlauncher/src/main/res/drawable-mdpi/text_select_handle_right_mtrl_alpha.png and /dev/null differ
diff --git a/app_pojavlauncher/src/main/res/drawable-xhdpi/hide_sidebar.png b/app_pojavlauncher/src/main/res/drawable-xhdpi/ic_setting_hide_sidebar.png
old mode 100755
new mode 100644
similarity index 100%
rename from app_pojavlauncher/src/main/res/drawable-xhdpi/hide_sidebar.png
rename to app_pojavlauncher/src/main/res/drawable-xhdpi/ic_setting_hide_sidebar.png
diff --git a/app_pojavlauncher/src/main/res/drawable-xhdpi/text_select_handle_left_mtrl_alpha.png b/app_pojavlauncher/src/main/res/drawable-xhdpi/text_select_handle_left_mtrl_alpha.png
deleted file mode 100644
index a01ac1030..000000000
Binary files a/app_pojavlauncher/src/main/res/drawable-xhdpi/text_select_handle_left_mtrl_alpha.png and /dev/null differ
diff --git a/app_pojavlauncher/src/main/res/drawable-xhdpi/text_select_handle_right_mtrl_alpha.png b/app_pojavlauncher/src/main/res/drawable-xhdpi/text_select_handle_right_mtrl_alpha.png
deleted file mode 100644
index d3602d988..000000000
Binary files a/app_pojavlauncher/src/main/res/drawable-xhdpi/text_select_handle_right_mtrl_alpha.png and /dev/null differ
diff --git a/app_pojavlauncher/src/main/res/drawable-xxhdpi/text_select_handle_left_mtrl_alpha.png b/app_pojavlauncher/src/main/res/drawable-xxhdpi/text_select_handle_left_mtrl_alpha.png
deleted file mode 100644
index 75085ce6d..000000000
Binary files a/app_pojavlauncher/src/main/res/drawable-xxhdpi/text_select_handle_left_mtrl_alpha.png and /dev/null differ
diff --git a/app_pojavlauncher/src/main/res/drawable-xxhdpi/text_select_handle_right_mtrl_alpha.png b/app_pojavlauncher/src/main/res/drawable-xxhdpi/text_select_handle_right_mtrl_alpha.png
deleted file mode 100644
index e2eb5bed2..000000000
Binary files a/app_pojavlauncher/src/main/res/drawable-xxhdpi/text_select_handle_right_mtrl_alpha.png and /dev/null differ
diff --git a/app_pojavlauncher/src/main/res/drawable/ignore_notch.png b/app_pojavlauncher/src/main/res/drawable/ic_setting_ignore_notch.png
old mode 100755
new mode 100644
similarity index 100%
rename from app_pojavlauncher/src/main/res/drawable/ignore_notch.png
rename to app_pojavlauncher/src/main/res/drawable/ic_setting_ignore_notch.png
diff --git a/app_pojavlauncher/src/main/res/drawable/mouse_pointer_spd.png b/app_pojavlauncher/src/main/res/drawable/ic_setting_mouse_pointer_spd.png
similarity index 100%
rename from app_pojavlauncher/src/main/res/drawable/mouse_pointer_spd.png
rename to app_pojavlauncher/src/main/res/drawable/ic_setting_mouse_pointer_spd.png
diff --git a/app_pojavlauncher/src/main/res/drawable/resolution_scaler.png b/app_pojavlauncher/src/main/res/drawable/ic_setting_resolution_scaler.png
old mode 100755
new mode 100644
similarity index 100%
rename from app_pojavlauncher/src/main/res/drawable/resolution_scaler.png
rename to app_pojavlauncher/src/main/res/drawable/ic_setting_resolution_scaler.png
diff --git a/app_pojavlauncher/src/main/res/drawable/sign_in_background.png b/app_pojavlauncher/src/main/res/drawable/ic_setting_sign_in_background.png
similarity index 100%
rename from app_pojavlauncher/src/main/res/drawable/sign_in_background.png
rename to app_pojavlauncher/src/main/res/drawable/ic_setting_sign_in_background.png
diff --git a/app_pojavlauncher/src/main/res/drawable/mouse_pointer_1.png b/app_pojavlauncher/src/main/res/drawable/mouse_pointer_1.png
deleted file mode 100755
index e5bb2041d..000000000
Binary files a/app_pojavlauncher/src/main/res/drawable/mouse_pointer_1.png and /dev/null differ
diff --git a/app_pojavlauncher/src/main/res/drawable/text_select_handle_left_material.xml b/app_pojavlauncher/src/main/res/drawable/text_select_handle_left_material.xml
deleted file mode 100644
index b228d3f5a..000000000
--- a/app_pojavlauncher/src/main/res/drawable/text_select_handle_left_material.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
-    android:src="@drawable/text_select_handle_left_mtrl_alpha"
-    android:tint="?attr/colorControlActivated" />
diff --git a/app_pojavlauncher/src/main/res/drawable/text_select_handle_right_material.xml b/app_pojavlauncher/src/main/res/drawable/text_select_handle_right_material.xml
deleted file mode 100644
index acacbf678..000000000
--- a/app_pojavlauncher/src/main/res/drawable/text_select_handle_right_material.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
-    android:src="@drawable/text_select_handle_right_mtrl_alpha"
-    android:tint="?attr/colorControlActivated" />
diff --git a/app_pojavlauncher/src/main/res/drawable/view_handle.xml b/app_pojavlauncher/src/main/res/drawable/view_handle.xml
new file mode 100644
index 000000000..f85c50284
--- /dev/null
+++ b/app_pojavlauncher/src/main/res/drawable/view_handle.xml
@@ -0,0 +1,4 @@
+<vector android:height="25dp" android:viewportHeight="237.15"
+    android:viewportWidth="235.95" android:width="25dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="?attr/colorControlActivated"  android:pathData="M0.17,5.8c-0.3,3.3 -0.2,34 0.3,68.4 0.9,56.5 1.2,63.4 3,72a110.3,110.3 0,0 0,31.9 59.2A125,125 0,0 0,137.57 235.7c51,-8.2 86.7,-42.2 96.6,-92.1 2.1,-10.7 2.4,-36.6 0.6,-46.4 -2,-10.2 -7.1,-25.8 -10.9,-33.5 -17.1,-34 -44.3,-53.6 -84.8,-61.1 -7.6,-1.4 -19.3,-1.7 -73.6,-2.1l-64.7,-0.5 -0.6,5.8z"/>
+</vector>
diff --git a/app_pojavlauncher/src/main/res/layout/import_control_layout.xml b/app_pojavlauncher/src/main/res/layout/import_control_layout.xml
index 4e5704f38..5aac9e3d1 100644
--- a/app_pojavlauncher/src/main/res/layout/import_control_layout.xml
+++ b/app_pojavlauncher/src/main/res/layout/import_control_layout.xml
@@ -12,7 +12,7 @@
         android:layout_height="match_parent"
         android:elevation="-10dp"
         android:scaleType="centerCrop"
-        android:src="@drawable/sign_in_background" />
+        android:src="@drawable/ic_setting_sign_in_background" />
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
diff --git a/app_pojavlauncher/src/main/res/layout/launcher_login_v3.xml b/app_pojavlauncher/src/main/res/layout/launcher_login_v3.xml
index 3ea7c9697..5cb4076cf 100644
--- a/app_pojavlauncher/src/main/res/layout/launcher_login_v3.xml
+++ b/app_pojavlauncher/src/main/res/layout/launcher_login_v3.xml
@@ -19,7 +19,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:elevation="-10dp"
-        android:src="@drawable/sign_in_background"
+        android:src="@drawable/ic_setting_sign_in_background"
         android:scaleType="centerCrop"
         />
 
diff --git a/app_pojavlauncher/src/main/res/values/styles.xml b/app_pojavlauncher/src/main/res/values/styles.xml
index 0c537ead5..5067d8708 100644
--- a/app_pojavlauncher/src/main/res/values/styles.xml
+++ b/app_pojavlauncher/src/main/res/values/styles.xml
@@ -9,23 +9,4 @@
         <item name="android:windowTranslucentNavigation">true</item>
         <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
     </style>
-
-    <style name="MenuDialog" parent="@style/AppTheme">
-        <item name="windowActionBar">false</item>
-        <item name="windowNoTitle">true</item>
-
-        <item name="android:windowFrame">@null</item>
-        <item name="android:windowIsFloating">true</item>
-        <item name="android:windowContentOverlay">@null</item>
-        <item name="android:windowAnimationStyle">@style/MenuDialogAnimation</item>
-        <item name="android:windowSoftInputMode">stateUnspecified|adjustPan</item>
-        <item name="android:windowTranslucentNavigation">true</item>
-    </style>
-
-    <style name="MenuDialogAnimation">
-        <item name="android:windowEnterAnimation">@anim/translate_left_side</item>
-        <item name="android:windowExitAnimation">@anim/translate_right_side</item>
-        <item name="android:windowTranslucentNavigation">true</item>
-    </style>
-
 </resources>
diff --git a/app_pojavlauncher/src/main/res/xml/pref_control.xml b/app_pojavlauncher/src/main/res/xml/pref_control.xml
index 982daf915..f5cc23764 100644
--- a/app_pojavlauncher/src/main/res/xml/pref_control.xml
+++ b/app_pojavlauncher/src/main/res/xml/pref_control.xml
@@ -9,7 +9,7 @@
 
         <androidx.preference.SwitchPreferenceCompat
             android:defaultValue="false"
-            android:icon="@drawable/ic_disable_gestures"
+            android:icon="@drawable/ic_setting_disable_gestures"
             android:key="disableGestures"
             android:summary="@string/mcl_disable_gestures_subtitle"
             android:title="@string/mcl_disable_gestures" />
@@ -21,7 +21,7 @@
             app2:showSeekBarValue="true"
             app2:selectable="false"
             app2:seekBarIncrement="10"
-            app2:icon="@drawable/tap_len" />
+            app2:icon="@drawable/ic_setting_tap_length" />
 
     </PreferenceCategory>
 
@@ -35,7 +35,7 @@
             app2:showSeekBarValue="true"
             app2:selectable="false"
             app2:seekBarIncrement="5"
-            app2:icon="@drawable/btn_scale"/>
+            app2:icon="@drawable/ic_setting_btn_scale"/>
 
         <net.kdt.pojavlaunch.prefs.ControlOffsetPreference/>
 
@@ -48,7 +48,7 @@
             android:key="mousescale"
             android:summary="@string/mcl_setting_subtitle_mousescale"
             android:title="@string/mcl_setting_title_mousescale"
-            app2:icon="@drawable/mouse_pointer_1"
+            app2:icon="@drawable/ic_setting_mouse_pointer"
             app2:selectable="false"
             app2:seekBarIncrement="5"
             app2:showSeekBarValue="true" />
@@ -56,7 +56,7 @@
             android:key="mousespeed"
             android:summary="@string/mcl_setting_subtitle_mousespeed"
             android:title="@string/mcl_setting_title_mousespeed"
-            app2:icon="@drawable/mouse_pointer_spd"
+            app2:icon="@drawable/ic_setting_mouse_pointer_spd"
             app2:selectable="false"
             app2:seekBarIncrement="5"
             app2:showSeekBarValue="true" />
diff --git a/app_pojavlauncher/src/main/res/xml/pref_java.xml b/app_pojavlauncher/src/main/res/xml/pref_java.xml
index a45405076..64d9a5164 100644
--- a/app_pojavlauncher/src/main/res/xml/pref_java.xml
+++ b/app_pojavlauncher/src/main/res/xml/pref_java.xml
@@ -11,7 +11,7 @@
 
         <androidx.preference.EditTextPreference
             android:dialogTitle="@string/mcl_setting_title_javaargs"
-            android:icon="@drawable/jre_args"
+            android:icon="@drawable/ic_setting_jre_args"
             android:key="javaArgs"
             android:singleLine="true"
             android:summary="@string/mcl_setting_subtitle_javaargs"
@@ -19,7 +19,7 @@
 
         <net.kdt.pojavlaunch.prefs.CustomSeekBarPreference
             android:key="allocation"
-            android:icon="@drawable/ic_auto_ram"
+            android:icon="@drawable/ic_setting_ram"
             android:summary="@string/mcl_memory_allocation_subtitle"
             android:title="@string/mcl_memory_allocation"
             app2:showSeekBarValue="true"
diff --git a/app_pojavlauncher/src/main/res/xml/pref_misc.xml b/app_pojavlauncher/src/main/res/xml/pref_misc.xml
index bb241cfbf..bc56f6ad2 100644
--- a/app_pojavlauncher/src/main/res/xml/pref_misc.xml
+++ b/app_pojavlauncher/src/main/res/xml/pref_misc.xml
@@ -18,11 +18,11 @@
             android:key="hideSidebar"
             android:summary="@string/mcl_setting_subtitle_hide_sidebar"
             android:title="@string/mcl_setting_title_hide_sidebar"
-            app2:icon="@drawable/hide_sidebar" />
+            app2:icon="@drawable/ic_setting_hide_sidebar" />
 
         <SwitchPreference
             android:defaultValue="true"
-            android:icon="@drawable/ic_lib_check"
+            android:icon="@drawable/ic_setting_lib_check"
             android:key="checkLibraries"
             android:summary="@string/mcl_setting_check_libraries_subtitle"
             android:title="@string/mcl_setting_check_libraries" />
diff --git a/app_pojavlauncher/src/main/res/xml/pref_video.xml b/app_pojavlauncher/src/main/res/xml/pref_video.xml
index 8832a5838..255609284 100644
--- a/app_pojavlauncher/src/main/res/xml/pref_video.xml
+++ b/app_pojavlauncher/src/main/res/xml/pref_video.xml
@@ -18,7 +18,7 @@
             android:key="ignoreNotch"
             android:summary="@string/mcl_setting_subtitle_ignore_notch"
             android:title="@string/mcl_setting_title_ignore_notch"
-            app2:icon="@drawable/ignore_notch" />
+            app2:icon="@drawable/ic_setting_ignore_notch" />
 
         <net.kdt.pojavlaunch.prefs.CustomSeekBarPreference
             android:key="resolutionRatio"
@@ -27,6 +27,6 @@
             app2:showSeekBarValue="true"
             app2:selectable="false"
             app2:seekBarIncrement="5"
-            app2:icon="@drawable/resolution_scaler"/>
+            app2:icon="@drawable/ic_setting_resolution_scaler"/>
     </PreferenceCategory>
 </PreferenceScreen>
\ No newline at end of file