diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/PandroidApplication.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/PandroidApplication.java
index 02fbbbcc3..b9693b3a9 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/PandroidApplication.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/PandroidApplication.java
@@ -9,6 +9,8 @@
 import com.panda3ds.pandroid.R;
 import com.panda3ds.pandroid.data.config.GlobalConfig;
 import com.panda3ds.pandroid.input.InputMap;
+import com.google.android.material.color.DynamicColors;
+import com.google.android.material.color.DynamicColorsOptions;
 import com.panda3ds.pandroid.utils.GameUtils;
 
 
@@ -24,6 +26,11 @@ public void onCreate() {
 		GameUtils.initialize();
 		InputMap.initialize();
 		AlberDriver.Setup();
+
+	   DynamicColorsOptions dynamicColorsOptions = new DynamicColorsOptions.Builder()
+               .build();
+
+           DynamicColors.applyToActivitiesIfAvailable(this, dynamicColorsOptions);
 	}
 
 	public static int getThemeId() {
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/game/DrawerFragment.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/game/DrawerFragment.java
index bd402b525..3506e0546 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/game/DrawerFragment.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/game/DrawerFragment.java
@@ -12,6 +12,8 @@
 import androidx.appcompat.widget.AppCompatTextView;
 import androidx.drawerlayout.widget.DrawerLayout;
 import androidx.fragment.app.Fragment;
+import android.content.pm.ActivityInfo;
+import android.content.res.Configuration;
 
 import com.google.android.material.navigation.NavigationView;
 import com.panda3ds.pandroid.AlberDriver;
@@ -47,7 +49,6 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
         ((AppCompatTextView)view.findViewById(R.id.game_publisher)).setText(game.getPublisher());
 
         ((NavigationView)view.findViewById(R.id.action_navigation)).setNavigationItemSelectedListener(this);
-        ((NavigationView)view.findViewById(R.id.others_navigation)).setNavigationItemSelectedListener(this);
     }
 
     @Override
@@ -80,6 +81,17 @@ public void close() {
         }
     }
 
+    private void changeScreenOrientation() {
+    int currentOrientation = getResources().getConfiguration().orientation;
+
+    // Change the orientation
+    if (currentOrientation == Configuration.ORIENTATION_LANDSCAPE) {
+        requireActivity().setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
+    } else {
+        requireActivity().setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
+    }
+}
+
     @Override
     public void onDrawerSlide(@NonNull View drawerView, float slideOffset) {}
 
@@ -106,6 +118,8 @@ public boolean onNavigationItemSelected(@NonNull MenuItem item) {
             requireActivity().finish();
         } else if (id == R.id.lua_script){
             new LuaDialogFragment().show(getParentFragmentManager(), null);
+        } else if (id == R.id.change_orientation) {
+        changeScreenOrientation();
         }
 
         return false;
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/game/LuaDialogFragment.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/game/LuaDialogFragment.java
index 1db9f9c76..e7da87bfb 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/game/LuaDialogFragment.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/game/LuaDialogFragment.java
@@ -12,6 +12,7 @@
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.recyclerview.widget.RecyclerView;
+import com.google.android.material.button.MaterialButton;
 
 import com.panda3ds.pandroid.AlberDriver;
 import com.panda3ds.pandroid.R;
@@ -182,4 +183,4 @@ private long lastModified() {
             return FileUtils.getLastModified(absolutePath());
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/pandroid/app/src/main/res/drawable/rounded_selectable_item_background.xml b/src/pandroid/app/src/main/res/drawable/rounded_selectable_item_background.xml
new file mode 100644
index 000000000..fad2fe967
--- /dev/null
+++ b/src/pandroid/app/src/main/res/drawable/rounded_selectable_item_background.xml
@@ -0,0 +1,9 @@
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="?colorControlHighlight">
+    <item android:id="@android:id/mask">
+        <shape android:shape="rectangle">
+            <corners android:radius="9dp" />
+            <solid android:color="@android:color/black" />
+        </shape>
+    </item>
+</ripple>
diff --git a/src/pandroid/app/src/main/res/layout/activity_main.xml b/src/pandroid/app/src/main/res/layout/activity_main.xml
index 6de640209..8ab31afd6 100644
--- a/src/pandroid/app/src/main/res/layout/activity_main.xml
+++ b/src/pandroid/app/src/main/res/layout/activity_main.xml
@@ -7,6 +7,14 @@
     android:layout_height="match_parent"
     tools:context=".app.MainActivity">
 
+    <com.google.android.material.appbar.MaterialToolbar
+        android:id="@+id/topAppBar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="?colorSurfaceVariant"
+        android:minHeight="?attr/actionBarSize"
+        app:title="@string/app_name" />
+
     <androidx.fragment.app.FragmentContainerView
         android:id="@+id/fragment_container"
         android:layout_width="0dp"
@@ -26,4 +34,4 @@
         app:menu="@menu/main_activity_navigation"
         style="@style/ThemedNavigationBottom"/>
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/src/pandroid/app/src/main/res/layout/dialog_lua_scripts.xml b/src/pandroid/app/src/main/res/layout/dialog_lua_scripts.xml
index 69a9d0a46..b04848797 100644
--- a/src/pandroid/app/src/main/res/layout/dialog_lua_scripts.xml
+++ b/src/pandroid/app/src/main/res/layout/dialog_lua_scripts.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.appcompat.widget.LinearLayoutCompat xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:orientation="vertical"
     android:layout_marginTop="10dp"
     android:layout_marginBottom="10dp">
@@ -12,7 +12,6 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-
         <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
@@ -31,35 +30,35 @@
 
         </androidx.constraintlayout.widget.ConstraintLayout>
 
-        <androidx.appcompat.widget.LinearLayoutCompat
+        <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="100dp"
             android:orientation="vertical"
             android:layout_gravity="bottom|center">
 
-            <androidx.appcompat.widget.AppCompatButton
+            <com.google.android.material.button.MaterialButton
                 android:id="@+id/open_file"
                 android:layout_width="match_parent"
                 android:layout_height="40dp"
                 android:text="@string/open_file"
                 android:layout_margin="5dp"
                 android:textColor="?colorOnPrimary"
-                android:backgroundTint="?colorPrimary"
+                app:backgroundTint="?colorPrimary"
                 android:background="@drawable/simple_card_background"/>
 
-            <androidx.appcompat.widget.AppCompatButton
+            <com.google.android.material.button.MaterialButton
                 android:id="@+id/create"
                 android:layout_width="match_parent"
                 android:layout_height="40dp"
                 android:text="@string/create_new"
                 android:layout_margin="5dp"
                 android:textColor="?colorOnSurfaceVariant"
-                android:backgroundTint="?colorSurfaceVariant"
+                app:backgroundTint="?colorSurfaceVariant"
                 android:background="@drawable/simple_card_background"
                 android:layout_marginBottom="10dp"/>
 
-        </androidx.appcompat.widget.LinearLayoutCompat>
+        </LinearLayout>
 
     </FrameLayout>
 
-</androidx.appcompat.widget.LinearLayoutCompat>
\ No newline at end of file
+</LinearLayout>
diff --git a/src/pandroid/app/src/main/res/layout/fragment_game_drawer.xml b/src/pandroid/app/src/main/res/layout/fragment_game_drawer.xml
index fa81a503f..c4a698eac 100644
--- a/src/pandroid/app/src/main/res/layout/fragment_game_drawer.xml
+++ b/src/pandroid/app/src/main/res/layout/fragment_game_drawer.xml
@@ -1,105 +1,97 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.appcompat.widget.LinearLayoutCompat xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.drawerlayout.widget.DrawerLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/drawer_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:orientation="vertical"
     android:background="?colorSurface">
 
-
-    <androidx.appcompat.widget.LinearLayoutCompat
+    <!-- Main content layout -->
+    <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:gravity="center"
-        android:paddingLeft="10dp"
-        android:paddingRight="10dp"
-        android:minHeight="190dp"
-        android:background="?colorSurfaceVariant">
-
-        <androidx.cardview.widget.CardView
-            android:layout_width="90dp"
-            android:layout_height="90dp"
-            app:cardCornerRadius="10dp"
-            android:layout_marginTop="20dp"
-            android:layout_marginBottom="20dp">
-
-            <com.panda3ds.pandroid.view.gamesgrid.GameIconView
-                android:id="@+id/game_icon"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:background="?colorSurface"/>
-
-        </androidx.cardview.widget.CardView>
+        android:layout_height="match_parent"
+        android:orientation="vertical">
 
-        <androidx.appcompat.widget.LinearLayoutCompat
+        <!-- Game related content -->
+        <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical"
             android:gravity="center"
-            android:layout_marginBottom="20dp">
-
-            <androidx.appcompat.widget.AppCompatTextView
-                android:id="@+id/game_title"
-                android:layout_width="wrap_content"
+            android:paddingLeft="10dp"
+            android:paddingRight="10dp"
+            android:minHeight="190dp"
+            android:background="?colorSurfaceVariant">
+
+            <com.google.android.material.card.MaterialCardView
+                android:layout_width="90dp"
+                android:layout_height="90dp"
+                app:cardCornerRadius="10dp"
+                android:layout_marginTop="20dp"
+                android:layout_marginBottom="20dp">
+
+                <com.panda3ds.pandroid.view.gamesgrid.GameIconView
+                    android:id="@+id/game_icon"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:background="?colorSurface"/>
+
+            </com.google.android.material.card.MaterialCardView>
+
+            <LinearLayout
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:text="@string/app_name"
-                android:textColor="?colorOnSurfaceVariant"
-                android:paddingBottom="4dp"
+                android:orientation="vertical"
                 android:gravity="center"
-                android:textStyle="bold"
-                android:textSize="19sp"/>
-
-            <androidx.appcompat.widget.AppCompatTextView
-                android:id="@+id/game_publisher"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/app_name"
-                android:textColor="?colorOnSurfaceVariant"
-                android:textSize="14sp"/>
-
-        </androidx.appcompat.widget.LinearLayoutCompat>
-
-    </androidx.appcompat.widget.LinearLayoutCompat>
-
-    <ScrollView
-        android:layout_width="match_parent"
+                android:layout_marginBottom="20dp">
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    android:id="@+id/game_title"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/app_name"
+                    android:textColor="?colorOnSurfaceVariant"
+                    android:paddingBottom="4dp"
+                    android:gravity="center"
+                    android:textStyle="bold"
+                    android:ellipsize="marquee"
+                    style="?attr/textAppearanceTitleSmall"
+                    android:marqueeRepeatLimit="marquee_forever"
+                    android:singleLine="true"
+                    android:textSize="19sp"/>
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    android:id="@+id/game_publisher"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/app_name"
+                    android:textColor="?colorOnSurfaceVariant"
+                    android:textSize="14sp"/>
+
+            </LinearLayout>
+
+        </LinearLayout>
+
+    </LinearLayout>
+
+    <!-- Drawer content layout -->
+    <LinearLayout
+        android:layout_width="wrap_content"
         android:layout_height="match_parent"
-        android:layout_marginTop="10dp">
+        android:orientation="vertical"
+        android:gravity="start"
+        android:layout_marginTop="195dp">
 
-        <androidx.appcompat.widget.LinearLayoutCompat
+        <com.google.android.material.navigation.NavigationView
+            android:id="@+id/action_navigation"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <androidx.appcompat.widget.AppCompatTextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/actions"
-                style="@style/TextAppearanceGameDrawerSubTitle"/>
-
-            <com.google.android.material.navigation.NavigationView
-                android:id="@+id/action_navigation"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                app:menu="@menu/game_drawer_actions"
-                android:background="?colorSurface"/>
-
-            <androidx.appcompat.widget.AppCompatTextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/others"
-                style="@style/TextAppearanceGameDrawerSubTitle"/>
-
-            <com.google.android.material.navigation.NavigationView
-                android:id="@+id/others_navigation"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                app:menu="@menu/game_drawer_others"
-                android:background="?colorSurface"/>
-
-        </androidx.appcompat.widget.LinearLayoutCompat>
+            app:menu="@menu/game_drawer_settings"
+            android:background="?colorSurface"
+            android:theme="@style/Widget.App.NavigationView"
+            app:subheaderTextAppearance="@style/TextAppearanceGameDrawerSubTitle"/>
 
-    </ScrollView>
+    </LinearLayout>
 
-</androidx.appcompat.widget.LinearLayoutCompat>
\ No newline at end of file
+</androidx.drawerlayout.widget.DrawerLayout>
diff --git a/src/pandroid/app/src/main/res/layout/fragment_games.xml b/src/pandroid/app/src/main/res/layout/fragment_games.xml
index ee69fdc8a..0538aeb6b 100644
--- a/src/pandroid/app/src/main/res/layout/fragment_games.xml
+++ b/src/pandroid/app/src/main/res/layout/fragment_games.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
+    android:layout_marginTop="60dp"
     android:layout_height="match_parent">
 
     <com.panda3ds.pandroid.view.gamesgrid.GamesGridView
@@ -10,16 +13,16 @@
         android:paddingStart="15dp"
         android:paddingEnd="15dp"/>
 
-    <androidx.appcompat.widget.AppCompatImageButton
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/add_rom"
-        android:layout_width="50dp"
-        android:layout_height="50dp"
-        android:layout_marginEnd="20dp"
-        android:layout_marginBottom="20dp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_margin="16dp"
         android:layout_gravity="end|bottom"
         android:src="@drawable/ic_add"
-        android:tint="?colorOnPrimary"
-        android:background="@drawable/simple_card_background"
-        android:backgroundTint="?colorPrimary"/>
+        android:gravity="center"
+        app:rippleColor="?colorOnSurfaceVariant"
+        app:backgroundTint="?colorPrimary"
+        tools:ignore="PrivateResource"/>
 
-</FrameLayout>
\ No newline at end of file
+</FrameLayout>
diff --git a/src/pandroid/app/src/main/res/layout/fragment_search.xml b/src/pandroid/app/src/main/res/layout/fragment_search.xml
index 5872a4043..c887b9878 100644
--- a/src/pandroid/app/src/main/res/layout/fragment_search.xml
+++ b/src/pandroid/app/src/main/res/layout/fragment_search.xml
@@ -9,16 +9,17 @@
     <FrameLayout
         android:layout_width="match_parent"
         android:layout_height="64dp"
-        android:paddingHorizontal="20dp">
+        android:paddingHorizontal="20dp"
+        android:background="?colorSurfaceVariant">
 
-        <androidx.appcompat.widget.AppCompatEditText
+        <com.google.android.material.textfield.TextInputEditText
             android:id="@+id/search_bar"
             android:layout_width="match_parent"
             android:layout_height="40dp"
             android:layout_gravity="center"
-            android:hint="@string/search"
             android:paddingEnd="10dp"
             android:paddingStart="50dp"
+            android:hint="@string/search"
             android:textSize="16sp"
             android:background="@drawable/search_bar_background"
             android:backgroundTint="?colorSurfaceVariant" />
@@ -46,4 +47,4 @@
 
     </FrameLayout>
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/src/pandroid/app/src/main/res/layout/holder_game.xml b/src/pandroid/app/src/main/res/layout/holder_game.xml
index b2d46d1b4..fd14573fc 100644
--- a/src/pandroid/app/src/main/res/layout/holder_game.xml
+++ b/src/pandroid/app/src/main/res/layout/holder_game.xml
@@ -4,13 +4,17 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:foreground="@drawable/rounded_selectable_item_background"
+    android:focusable="true"
     android:orientation="vertical"
     android:padding="15dp">
 
-    <androidx.cardview.widget.CardView
+    <com.google.android.material.card.MaterialCardView
+        style="@style/Widget.Material3.CardView.Elevated"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        app:cardCornerRadius="16dp">
+        android:layout_margin="10dp"
+        app:shapeAppearance="?attr/shapeAppearanceCornerLarge">
 
         <com.panda3ds.pandroid.view.gamesgrid.GameIconView
             android:id="@+id/icon"
@@ -19,15 +23,20 @@
             android:scaleType="centerCrop"
             android:background="?colorSurfaceVariant"/>
 
-    </androidx.cardview.widget.CardView>
+    </com.google.android.material.card.MaterialCardView>
 
     <androidx.appcompat.widget.AppCompatTextView
         android:id="@+id/title"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        style="?attr/textAppearanceTitleSmall"
         android:text="@string/app_name"
-        android:layout_marginTop="8dp"
+        android:layout_marginStart="10dp"
+        android:layout_marginEnd="10dp"
         android:textStyle="bold"
+        android:ellipsize="marquee"
+        android:marqueeRepeatLimit="marquee_forever"
+        android:singleLine="true"
         android:gravity="center"/>
 
     <androidx.appcompat.widget.AppCompatTextView
@@ -36,6 +45,11 @@
         android:layout_height="wrap_content"
         android:text="@string/app_name"
         android:textSize="10sp"
+        android:layout_marginStart="10dp"
+        android:layout_marginEnd="10dp"
+        android:ellipsize="marquee"
+        android:marqueeRepeatLimit="marquee_forever"
+        android:singleLine="true"
         android:gravity="center"/>
 
-</androidx.appcompat.widget.LinearLayoutCompat>
\ No newline at end of file
+</androidx.appcompat.widget.LinearLayoutCompat>
diff --git a/src/pandroid/app/src/main/res/layout/holder_lua_script.xml b/src/pandroid/app/src/main/res/layout/holder_lua_script.xml
index a1865c3f4..071d3c8cc 100644
--- a/src/pandroid/app/src/main/res/layout/holder_lua_script.xml
+++ b/src/pandroid/app/src/main/res/layout/holder_lua_script.xml
@@ -1,43 +1,50 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:gravity="start|center"
     android:padding="5dp">
 
-    <androidx.appcompat.widget.LinearLayoutCompat
+    <com.google.android.material.card.MaterialCardView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@drawable/simple_card_background"
-        android:backgroundTint="?colorSurfaceVariant"
-        android:orientation="vertical"
-        android:gravity="center"
-        android:padding="10dp">
+        app:cardBackgroundColor="?attr/colorSurfaceVariant"
+        app:cardCornerRadius="8dp"
+        android:layout_gravity="center"
+        android:layout_margin="10dp">
 
-        <androidx.appcompat.widget.AppCompatImageView
-            android:layout_width="70dp"
-            android:layout_height="70dp"
-            android:layout_marginHorizontal="5dp"
-            android:scaleType="fitCenter"
-            android:tint="?colorOnSurfaceVariant"
-            android:alpha="0.5"
-            android:padding="14dp"
-            android:src="@drawable/ic_code"
-            android:layout_marginBottom="14dp"/>
-
-        <TextView
-            android:id="@+id/title"
+        <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="@string/app_name"
-            android:textSize="15sp"
-            android:gravity="center"/>
+            android:orientation="vertical"
+            android:gravity="center"
+            android:padding="10dp">
+
+            <ImageView
+                android:layout_width="70dp"
+                android:layout_height="70dp"
+                android:layout_marginHorizontal="5dp"
+                android:scaleType="fitCenter"
+                android:tint="?attr/colorOnSurfaceVariant"
+                android:alpha="0.5"
+                android:padding="14dp"
+                android:src="@drawable/ic_code"
+                android:layout_marginBottom="14dp"/>
 
-    </androidx.appcompat.widget.LinearLayoutCompat>
+            <TextView
+                android:id="@+id/title"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/app_name"
+                android:textSize="15sp"
+                android:gravity="center"/>
 
+        </LinearLayout>
+    </com.google.android.material.card.MaterialCardView>
 
-    <androidx.appcompat.widget.AppCompatImageButton
+    <com.google.android.material.button.MaterialButton
         android:id="@+id/edit"
         android:layout_width="40dp"
         android:layout_height="40dp"
@@ -46,7 +53,6 @@
         android:padding="10dp"
         android:tint="?colorOnSurfaceVariant"
         android:layout_gravity="end|top"
-        android:background="#0000"
+        android:backgroundTint="#0000"
         android:layout_margin="10dp"/>
-
-</FrameLayout>
\ No newline at end of file
+</FrameLayout>
diff --git a/src/pandroid/app/src/main/res/layout/preference_simple_about.xml b/src/pandroid/app/src/main/res/layout/preference_simple_about.xml
index 9364de36b..cf6370b9f 100644
--- a/src/pandroid/app/src/main/res/layout/preference_simple_about.xml
+++ b/src/pandroid/app/src/main/res/layout/preference_simple_about.xml
@@ -2,6 +2,7 @@
 <androidx.appcompat.widget.LinearLayoutCompat xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="320dp"
+    android:layout_marginTop="22dp"
     android:orientation="vertical"
     android:gravity="center">
 
@@ -26,4 +27,4 @@
         android:alpha="0.5"
         android:textColor="?colorOnSurface"/>
 
-</androidx.appcompat.widget.LinearLayoutCompat>
\ No newline at end of file
+</androidx.appcompat.widget.LinearLayoutCompat>
diff --git a/src/pandroid/app/src/main/res/menu/game_drawer_actions.xml b/src/pandroid/app/src/main/res/menu/game_drawer_actions.xml
deleted file mode 100644
index 9fd3264a1..000000000
--- a/src/pandroid/app/src/main/res/menu/game_drawer_actions.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:id="@+id/resume"
-        android:icon="@drawable/ic_shortcut"
-        android:title="@string/resume"/>
-    <item
-        android:id="@+id/exit"
-        android:icon="@drawable/ic_exit"
-        android:title="@string/exit"/>
-</menu>
\ No newline at end of file
diff --git a/src/pandroid/app/src/main/res/menu/game_drawer_others.xml b/src/pandroid/app/src/main/res/menu/game_drawer_others.xml
deleted file mode 100644
index b6dd48976..000000000
--- a/src/pandroid/app/src/main/res/menu/game_drawer_others.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:id="@+id/lua_script"
-        android:icon="@drawable/ic_code"
-        android:title="@string/lua_script"/>
-</menu>
\ No newline at end of file
diff --git a/src/pandroid/app/src/main/res/menu/game_drawer_settings.xml b/src/pandroid/app/src/main/res/menu/game_drawer_settings.xml
new file mode 100644
index 000000000..12fa6d479
--- /dev/null
+++ b/src/pandroid/app/src/main/res/menu/game_drawer_settings.xml
@@ -0,0 +1,35 @@
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    android:divider="@null"
+    android:dividerHeight="0dp">
+    <item
+        android:id="@+id/header_actions"
+        android:title="Actions">
+      <menu>
+          
+        <item
+            android:id="@+id/resume"
+            android:icon="@drawable/ic_shortcut"
+            android:title="@string/resume" />
+        <item
+            android:id="@+id/exit"
+            android:icon="@drawable/ic_exit"
+            android:title="@string/exit"/>
+
+        </menu>
+     </item>
+     <item
+         android:id="@+id/header_others"
+         android:title="Others">
+      <menu>
+
+            <item
+                android:id="@+id/change_orientation"
+                android:icon="@drawable/ic_rotate_screen"
+                android:title="Rotate" />
+            <item
+                android:id="@+id/lua_script"
+                android:icon="@drawable/ic_code"
+                android:title="@string/lua_script" />
+     </menu>
+  </item>
+</menu>
diff --git a/src/pandroid/app/src/main/res/values/themes.xml b/src/pandroid/app/src/main/res/values/themes.xml
index 2ade71029..f37ca3683 100644
--- a/src/pandroid/app/src/main/res/values/themes.xml
+++ b/src/pandroid/app/src/main/res/values/themes.xml
@@ -26,6 +26,10 @@
 
     <style name="Theme.Pandroid" parent="Base.Theme.Pandroid" />
 
+<style name="Widget.App.NavigationView" parent="Widget.Material3.NavigationView">
+    <item name="android:listDivider">@android:color/transparent</item>
+</style>
+
     <style name="Theme.Pandroid.Custom" parent="Theme.Pandroid">
         <item name="android:textColor">?colorOnSurface</item>
         <item name="android:textSize">16sp</item>
@@ -92,4 +96,4 @@
         <item name="android:textColorSecondary">@color/text_secondary_dark</item>
     </style>
 
-</resources>
\ No newline at end of file
+</resources>