diff --git a/Android/res/drawable-hdpi/ic_debug.png b/Android/res/drawable-hdpi/ic_debug.png
new file mode 100644
index 000000000..0e63adb6e
Binary files /dev/null and b/Android/res/drawable-hdpi/ic_debug.png differ
diff --git a/Android/res/drawable-hdpi/ic_picture.png b/Android/res/drawable-hdpi/ic_picture.png
new file mode 100644
index 000000000..0f650ee25
Binary files /dev/null and b/Android/res/drawable-hdpi/ic_picture.png differ
diff --git a/Android/res/drawable-hdpi/ic_speaker.png b/Android/res/drawable-hdpi/ic_speaker.png
new file mode 100644
index 000000000..7b69ea56b
Binary files /dev/null and b/Android/res/drawable-hdpi/ic_speaker.png differ
diff --git a/Android/res/drawable-hdpi/ic_undo.png b/Android/res/drawable-hdpi/ic_undo.png
new file mode 100644
index 000000000..9e719c9cf
Binary files /dev/null and b/Android/res/drawable-hdpi/ic_undo.png differ
diff --git a/Android/res/drawable-mdpi/ic_debug.png b/Android/res/drawable-mdpi/ic_debug.png
new file mode 100644
index 000000000..58653ab9e
Binary files /dev/null and b/Android/res/drawable-mdpi/ic_debug.png differ
diff --git a/Android/res/drawable-mdpi/ic_picture.png b/Android/res/drawable-mdpi/ic_picture.png
new file mode 100644
index 000000000..d6235554b
Binary files /dev/null and b/Android/res/drawable-mdpi/ic_picture.png differ
diff --git a/Android/res/drawable-mdpi/ic_speaker.png b/Android/res/drawable-mdpi/ic_speaker.png
new file mode 100644
index 000000000..f8dd8469c
Binary files /dev/null and b/Android/res/drawable-mdpi/ic_speaker.png differ
diff --git a/Android/res/drawable-mdpi/ic_undo.png b/Android/res/drawable-mdpi/ic_undo.png
new file mode 100644
index 000000000..8b8f9edfc
Binary files /dev/null and b/Android/res/drawable-mdpi/ic_undo.png differ
diff --git a/Android/res/drawable-xhdpi/ic_debug.png b/Android/res/drawable-xhdpi/ic_debug.png
new file mode 100644
index 000000000..3d8ae0ff4
Binary files /dev/null and b/Android/res/drawable-xhdpi/ic_debug.png differ
diff --git a/Android/res/drawable-xhdpi/ic_picture.png b/Android/res/drawable-xhdpi/ic_picture.png
new file mode 100644
index 000000000..3f93e4f65
Binary files /dev/null and b/Android/res/drawable-xhdpi/ic_picture.png differ
diff --git a/Android/res/drawable-xhdpi/ic_speaker.png b/Android/res/drawable-xhdpi/ic_speaker.png
new file mode 100644
index 000000000..dfd2b33c7
Binary files /dev/null and b/Android/res/drawable-xhdpi/ic_speaker.png differ
diff --git a/Android/res/drawable-xhdpi/ic_undo.png b/Android/res/drawable-xhdpi/ic_undo.png
new file mode 100644
index 000000000..99967f2fb
Binary files /dev/null and b/Android/res/drawable-xhdpi/ic_undo.png differ
diff --git a/Android/res/values/strings.xml b/Android/res/values/strings.xml
index dd3f5c418..b8927c663 100644
--- a/Android/res/values/strings.xml
+++ b/Android/res/values/strings.xml
@@ -67,6 +67,18 @@
     <string name="galleryLibrary">Games</string>
 
     <!-- Settings -->
+    <string name="Hardware">Hardware</string>
+    <string name="Other">Other</string>
+    <string name="input_screen_summary">Controller settings</string>
+    <string name="input_screen_title">Input</string>
+    <string name="video_screen_summary">Graphic settings</string>
+    <string name="video_screen_title">Video</string>
+    <string name="audio_screen_summary">Sound settings</string>
+    <string name="audio_screen_title">Audio</string>
+    <string name="advanced_screen_summary">advanced/debugging settings</string>
+    <string name="advanced_screen_title">Advanced</string>
+    <string name="reset_summary">Restore default settings</string>
+    <string name="reset_title">Reset</string>
     <string name="preferences">Settings</string>
     <string name="settings_title">Settings</string>
     <string name="displayFps_title">Framerate</string>
diff --git a/Android/res/xml/settings.xml b/Android/res/xml/settings.xml
index 5dde352c9..446a0d055 100644
--- a/Android/res/xml/settings.xml
+++ b/Android/res/xml/settings.xml
@@ -2,9 +2,38 @@
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
     android:title="@string/preferences">
 
-    <CheckBoxPreference
-        android:defaultValue="false"
-        android:key="audio_Enabled"
-        android:summary="@string/audioEnabled_summary"
-        android:title="@string/audioEnabled_title" />
+    <PreferenceCategory android:title="@string/Hardware" >
+        <Preference
+            android:summary="@string/input_screen_summary"
+            android:title="@string/input_screen_title"
+            android:key="settings_input" 
+            android:icon="@drawable/ic_controller"
+            />
+        <Preference
+            android:summary="@string/video_screen_summary"
+            android:title="@string/video_screen_title"
+            android:key="settings_video" 
+            android:icon="@drawable/ic_picture"
+            />
+        <Preference
+            android:summary="@string/audio_screen_summary"
+            android:title="@string/audio_screen_title"
+            android:key="settings_audio" 
+            android:icon="@drawable/ic_speaker"
+            />
+    </PreferenceCategory>
+    <PreferenceCategory android:title="@string/Other" >
+        <Preference
+            android:summary="@string/advanced_screen_summary"
+            android:title="@string/advanced_screen_title"
+            android:key="settings_advanced" 
+            android:icon="@drawable/ic_debug"
+            />
+        <Preference
+            android:summary="@string/reset_summary"
+            android:title="@string/reset_title"
+            android:key="settings_reset" 
+            android:icon="@drawable/ic_undo"
+            />
+    </PreferenceCategory>
 </PreferenceScreen>