diff --git a/shell/android-studio/app/src/main/java/com/reicast/emulator/FileBrowser.java b/shell/android-studio/app/src/main/java/com/reicast/emulator/FileBrowser.java
index ffb04093b..fec826cbc 100644
--- a/shell/android-studio/app/src/main/java/com/reicast/emulator/FileBrowser.java
+++ b/shell/android-studio/app/src/main/java/com/reicast/emulator/FileBrowser.java
@@ -368,7 +368,7 @@ public class FileBrowser extends Fragment {
 		}
 
 		final View headerView = parentActivity.getLayoutInflater().inflate(
-				R.layout.head_list_item, null, false);
+				R.layout.browser_fragment_header, null, false);
 		((ImageView) headerView.findViewById(R.id.item_icon))
 				.setImageResource(R.drawable.open_folder);
 		((TextView) headerView.findViewById(R.id.item_name))
@@ -466,9 +466,9 @@ public class FileBrowser extends Fragment {
 			else
 				((TextView) childview.findViewById(R.id.item_name)).setText(file.getName());
 
-			((ImageView) childview.findViewById(R.id.item_icon))
-					.setImageResource(file == null ? R.drawable.config : file.isDirectory()
-							? R.drawable.open_folder : R.drawable.disk_unknown);
+			((ImageView) childview.findViewById(R.id.item_icon)).setImageResource(file == null
+					? R.drawable.ic_settings: file.isDirectory()
+					? R.drawable.ic_folder_black_24dp : R.drawable.disk_unknown);;
 
 			childview.setTag(file);
 
diff --git a/shell/android-studio/app/src/main/res/drawable/ic_folder_black_24dp.xml b/shell/android-studio/app/src/main/res/drawable/ic_folder_black_24dp.xml
new file mode 100644
index 000000000..3e6904682
--- /dev/null
+++ b/shell/android-studio/app/src/main/res/drawable/ic_folder_black_24dp.xml
@@ -0,0 +1,4 @@
+<vector android:height="40dp" android:viewportHeight="24.0"
+    android:viewportWidth="24.0" android:width="40dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M10,4H4c-1.1,0 -1.99,0.9 -1.99,2L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2V8c0,-1.1 -0.9,-2 -2,-2h-8l-2,-2z"/>
+</vector>
diff --git a/shell/android-studio/app/src/main/res/drawable/ic_settings.xml b/shell/android-studio/app/src/main/res/drawable/ic_settings.xml
new file mode 100644
index 000000000..ace746c40
--- /dev/null
+++ b/shell/android-studio/app/src/main/res/drawable/ic_settings.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M19.43,12.98c0.04,-0.32 0.07,-0.64 0.07,-0.98s-0.03,-0.66 -0.07,-0.98l2.11,-1.65c0.19,-0.15 0.24,-0.42 0.12,-0.64l-2,-3.46c-0.12,-0.22 -0.39,-0.3 -0.61,-0.22l-2.49,1c-0.52,-0.4 -1.08,-0.73 -1.69,-0.98l-0.38,-2.65C14.46,2.18 14.25,2 14,2h-4c-0.25,0 -0.46,0.18 -0.49,0.42l-0.38,2.65c-0.61,0.25 -1.17,0.59 -1.69,0.98l-2.49,-1c-0.23,-0.09 -0.49,0 -0.61,0.22l-2,3.46c-0.13,0.22 -0.07,0.49 0.12,0.64l2.11,1.65c-0.04,0.32 -0.07,0.65 -0.07,0.98s0.03,0.66 0.07,0.98l-2.11,1.65c-0.19,0.15 -0.24,0.42 -0.12,0.64l2,3.46c0.12,0.22 0.39,0.3 0.61,0.22l2.49,-1c0.52,0.4 1.08,0.73 1.69,0.98l0.38,2.65c0.03,0.24 0.24,0.42 0.49,0.42h4c0.25,0 0.46,-0.18 0.49,-0.42l0.38,-2.65c0.61,-0.25 1.17,-0.59 1.69,-0.98l2.49,1c0.23,0.09 0.49,0 0.61,-0.22l2,-3.46c0.12,-0.22 0.07,-0.49 -0.12,-0.64l-2.11,-1.65zM12,15.5c-1.93,0 -3.5,-1.57 -3.5,-3.5s1.57,-3.5 3.5,-3.5 3.5,1.57 3.5,3.5 -1.57,3.5 -3.5,3.5z"/>
+</vector>
diff --git a/shell/android-studio/app/src/main/res/layout/head_list_item.xml b/shell/android-studio/app/src/main/res/layout/browser_fragment_header.xml
similarity index 93%
rename from shell/android-studio/app/src/main/res/layout/head_list_item.xml
rename to shell/android-studio/app/src/main/res/layout/browser_fragment_header.xml
index 7378aeee4..392d31845 100644
--- a/shell/android-studio/app/src/main/res/layout/head_list_item.xml
+++ b/shell/android-studio/app/src/main/res/layout/browser_fragment_header.xml
@@ -30,7 +30,7 @@
             android:layout_marginRight="2dp"
             android:layout_marginTop="2dp"
             android:scaleType="fitCenter"
-            app:srcCompat="@drawable/gdi" />
+            app:srcCompat="@drawable/ic_settings" />
 
         <TextView
             android:id="@+id/item_name"
diff --git a/shell/android-studio/app/src/main/res/layout/browser_fragment_item.xml b/shell/android-studio/app/src/main/res/layout/browser_fragment_item.xml
index 951eb7c0f..208196deb 100644
--- a/shell/android-studio/app/src/main/res/layout/browser_fragment_item.xml
+++ b/shell/android-studio/app/src/main/res/layout/browser_fragment_item.xml
@@ -24,7 +24,7 @@
             android:layout_marginLeft="16dp"
             android:layout_gravity="center"
             android:tint="@color/ice_light"
-            app:srcCompat="@drawable/game_selector" />
+            app:srcCompat="@drawable/ic_folder_black_24dp" />
 
         <TextView
             android:id="@+id/item_name"
@@ -46,4 +46,4 @@
         android:layout_marginLeft="73dp"
         android:background="?android:attr/listDivider"/>
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/shell/android-studio/app/src/main/res/layout/items_browser_fragment.xml b/shell/android-studio/app/src/main/res/layout/items_browser_fragment.xml
new file mode 100644
index 000000000..2330dfa6e
--- /dev/null
+++ b/shell/android-studio/app/src/main/res/layout/items_browser_fragment.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/child_root"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+
+    <LinearLayout
+        android:id="@+id/childview"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:layout_centerInParent="true"
+        android:clickable="true"
+        android:focusable="true"
+        android:background="@drawable/game_selector" >
+
+        <ImageView
+            android:id="@+id/item_icon"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="16dp"
+            android:layout_gravity="center"
+            android:tint="@color/ice_light"
+            app:srcCompat="@drawable/ic_folder_black_24dp" />
+
+        <TextView
+            android:id="@+id/item_name"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:fontFamily="sans-serif-light"
+            android:paddingBottom="18dp"
+            android:paddingTop="18dp"
+            android:paddingLeft="16dp"
+            android:paddingRight="16dp"
+            android:textSize="@dimen/primary_text_material"
+            android:textColor="@color/ice_light"
+            android:text="@string/disk_loading" />
+    </LinearLayout>
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:layout_marginLeft="73dp"
+        android:background="?android:attr/listDivider"/>
+
+</LinearLayout>
\ No newline at end of file