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 6de64020..8ab31afd 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/fragment_games.xml b/src/pandroid/app/src/main/res/layout/fragment_games.xml
index 85f85069..0538aeb6 100644
--- a/src/pandroid/app/src/main/res/layout/fragment_games.xml
+++ b/src/pandroid/app/src/main/res/layout/fragment_games.xml
@@ -3,6 +3,7 @@
     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
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 5872a404..c887b987 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/preference_simple_about.xml b/src/pandroid/app/src/main/res/layout/preference_simple_about.xml
index 9364de36..cf6370b9 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>