diff --git a/shell/android/res/drawable/input.png b/shell/android/res/drawable/input.png
new file mode 100644
index 000000000..019545823
Binary files /dev/null and b/shell/android/res/drawable/input.png differ
diff --git a/shell/android/res/layout/controllers_fragment.xml b/shell/android/res/layout/controllers_fragment.xml
deleted file mode 100644
index 4ff4bd864..000000000
--- a/shell/android/res/layout/controllers_fragment.xml
+++ /dev/null
@@ -1,207 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical" >
-
-    <TableLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:stretchColumns="*" >
-
-        <TableRow android:gravity="center_vertical" >
-
-        <TextView
-            android:layout_weight="1"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:ems="10"
-            android:text="@string/customize_touch_controls" />
-
-            <LinearLayout
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:gravity="right"
-                android:orientation="vertical" >
-
-		<Button
-		    android:layout_weight="1"
-		    android:id="@+id/buttonLaunchEditor"
-		    android:layout_width="wrap_content"
-		    android:layout_height="wrap_content"
-		    android:text="@string/launch_editor" />
-            </LinearLayout>
-        </TableRow>
-
-
-        <TableRow android:gravity="center_vertical" >
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="0.5"
-                android:ems="10"
-                android:gravity="center_vertical|left"
-                android:text="@string/touch_vibration" />
-
-            <LinearLayout
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:gravity="right"
-                android:orientation="vertical" >
-
-                <de.ankri.views.Switch
-                    android:id="@+id/switchTouchVibrationEnabled"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content" />
-            </LinearLayout>
-        </TableRow>
-
-     <TableRow android:gravity="center_vertical" >
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:ems="10"
-            android:gravity="center_vertical|left"
-            android:text="@string/controller_1" />
-
-        <TextView
-            android:id="@+id/textViewDeviceDescriptorPlayer1"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:ems="10"
-            android:gravity="center_vertical|left"
-            android:text="@string/controller_none_selected" />
-
-        <Button
-            android:id="@+id/buttonSelectControllerPlayer1"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:gravity="right"
-            android:text="@string/select_controller" />
-
-        <Button
-            android:id="@+id/buttonRemoveControllerPlayer1"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:gravity="right"
-            android:text="@string/remove_controller" />
-   </TableRow>
-
-     <TableRow android:gravity="center_vertical" >
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:ems="10"
-            android:gravity="center_vertical|left"
-            android:text="@string/controller_2" />
-
-        <TextView
-            android:id="@+id/textViewDeviceDescriptorPlayer2"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:ems="10"
-            android:gravity="center_vertical|left"
-            android:text="@string/controller_none_selected" />
-
-        <Button
-            android:id="@+id/buttonSelectControllerPlayer2"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:gravity="right"
-            android:text="@string/select_controller" />
-
-        <Button
-            android:id="@+id/buttonRemoveControllerPlayer2"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:gravity="right"
-            android:text="@string/remove_controller" />
-   </TableRow>
-
-     <TableRow android:gravity="center_vertical" >
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:ems="10"
-            android:gravity="center_vertical|left"
-            android:text="@string/controller_3" />
-
-        <TextView
-            android:id="@+id/textViewDeviceDescriptorPlayer3"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:ems="10"
-            android:gravity="center_vertical|left"
-            android:text="@string/controller_none_selected" />
-
-        <Button
-            android:id="@+id/buttonSelectControllerPlayer3"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:gravity="right"
-            android:text="@string/select_controller" />
-
-        <Button
-            android:id="@+id/buttonRemoveControllerPlayer3"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:gravity="right"
-            android:text="@string/remove_controller" />
-    </TableRow>
-
-     <TableRow android:gravity="center_vertical" >
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:ems="10"
-            android:gravity="center_vertical|left"
-            android:text="@string/controller_4" />
-
-        <TextView
-            android:id="@+id/textViewDeviceDescriptorPlayer4"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:ems="10"
-            android:gravity="center_vertical|left"
-            android:text="@string/controller_none_selected" />
-
-        <Button
-            android:id="@+id/buttonSelectControllerPlayer4"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:gravity="right"
-            android:text="@string/select_controller" />
-
-        <Button
-            android:id="@+id/buttonRemoveControllerPlayer4"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:gravity="right"
-            android:text="@string/remove_controller" />
-        </TableRow>
-    </TableLayout>
-
-</LinearLayout>
diff --git a/shell/android/res/layout/input_fragment.xml b/shell/android/res/layout/input_fragment.xml
new file mode 100644
index 000000000..dc96cd43a
--- /dev/null
+++ b/shell/android/res/layout/input_fragment.xml
@@ -0,0 +1,244 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent" >
+
+    <TableLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:stretchColumns="*" >
+
+        <TableRow android:gravity="center_vertical" >
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:ems="10"
+                android:text="@string/customize_touch_controls" />
+
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:gravity="right"
+                android:orientation="vertical" >
+
+                <Button
+                    android:id="@+id/buttonLaunchEditor"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:ems="8"
+                    android:text="@string/launch_editor" />
+            </LinearLayout>
+        </TableRow>
+
+        <TableRow
+            android:layout_marginTop="25dp"
+            android:gravity="center_vertical" >
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="0.5"
+                android:ems="10"
+                android:gravity="center_vertical|left"
+                android:text="@string/touch_vibration" />
+
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:gravity="right"
+                android:orientation="vertical" >
+
+                <de.ankri.views.Switch
+                    android:id="@+id/switchTouchVibrationEnabled"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content" />
+            </LinearLayout>
+        </TableRow>
+
+        <TableRow
+            android:layout_marginTop="25dp"
+            android:gravity="center_vertical" >
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:ems="10"
+                android:gravity="center_vertical|left"
+                android:text="@string/controller_a" />
+
+            <TextView
+                android:id="@+id/textViewDeviceDescriptorPlayer1"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:ems="10"
+                android:gravity="center_vertical|left"
+                android:text="@string/controller_none_selected" />
+
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="right"
+                android:orientation="vertical" >
+
+                <Button
+                    android:id="@+id/buttonSelectControllerPlayer1"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:ems="6"
+                    android:text="@string/select" />
+
+                <Button
+                    android:id="@+id/buttonRemoveControllerPlayer1"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:ems="6"
+                    android:text="@string/remove" />
+            </LinearLayout>
+        </TableRow>
+
+        <TableRow
+            android:layout_marginTop="25dp"
+            android:gravity="center_vertical" >
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:ems="10"
+                android:gravity="center_vertical|left"
+                android:text="@string/controller_b" />
+
+            <TextView
+                android:id="@+id/textViewDeviceDescriptorPlayer2"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:ems="10"
+                android:gravity="center_vertical|left"
+                android:text="@string/controller_none_selected" />
+
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="right"
+                android:orientation="vertical" >
+
+                <Button
+                    android:id="@+id/buttonSelectControllerPlayer2"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:ems="6"
+                    android:text="@string/select" />
+
+                <Button
+                    android:id="@+id/buttonRemoveControllerPlayer2"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:ems="6"
+                    android:text="@string/remove" />
+            </LinearLayout>
+        </TableRow>
+
+        <TableRow
+            android:layout_marginTop="25dp"
+            android:gravity="center_vertical" >
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:ems="10"
+                android:gravity="center_vertical|left"
+                android:text="@string/controller_c" />
+
+            <TextView
+                android:id="@+id/textViewDeviceDescriptorPlayer3"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:ems="10"
+                android:gravity="center_vertical|left"
+                android:text="@string/controller_none_selected" />
+
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="right"
+                android:orientation="vertical" >
+
+                <Button
+                    android:id="@+id/buttonSelectControllerPlayer3"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:ems="6"
+                    android:text="@string/select" />
+
+                <Button
+                    android:id="@+id/buttonRemoveControllerPlayer3"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:ems="6"
+                    android:text="@string/remove" />
+            </LinearLayout>
+        </TableRow>
+
+        <TableRow
+            android:layout_marginTop="25dp"
+            android:gravity="center_vertical" >
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:ems="10"
+                android:gravity="center_vertical|left"
+                android:text="@string/controller_d" />
+
+            <TextView
+                android:id="@+id/textViewDeviceDescriptorPlayer4"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:ems="10"
+                android:gravity="center_vertical|left"
+                android:text="@string/controller_none_selected" />
+
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="right"
+                android:orientation="vertical" >
+
+                <Button
+                    android:id="@+id/buttonSelectControllerPlayer4"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:ems="6"
+                    android:text="@string/select" />
+
+                <Button
+                    android:id="@+id/buttonRemoveControllerPlayer4"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:ems="6"
+                    android:text="@string/remove" />
+            </LinearLayout>
+        </TableRow>
+    </TableLayout>
+
+</ScrollView>
\ No newline at end of file
diff --git a/shell/android/res/values-jp/strings.xml b/shell/android/res/values-jp/strings.xml
index 99182ebfe..55c638f64 100644
--- a/shell/android/res/values-jp/strings.xml
+++ b/shell/android/res/values-jp/strings.xml
@@ -28,13 +28,17 @@
 
     <string name="games_listing">利用可能なドリームキャストのゲーム</string>
 
-    <string name="controller_1">コントローラ 1</string>
-    <string name="controller_2">コントローラ 2</string>
-    <string name="controller_3">コントローラ 3</string>
-    <string name="controller_4">コントローラ 4</string>
-    <string name="controller_none">None</string>
-    <string name="select_controller">セレクトコントローラ</string>
-    <string name="remove_controller">コントローラを取り外し</string>
+    <string name="customize_touch_controls">Customize Touch Controls</string>
+    <string name="launch_editor">Launch Editor</string>
+    <string name="touch_vibration">Touch Vibration</string>
+    <string name="controller_a">コントローラ A</string>
+    <string name="controller_b">コントローラ B</string>
+    <string name="controller_c">コントローラ C</string>
+    <string name="controller_d">コントローラ D</string>
+    <string name="controller_not_connected">Controller Not Connected</string>
+    <string name="controller_none_selected">No Controller Selected</string>
+    <string name="select">選択する</string>
+    <string name="remove">削除する</string>
     <string name="select_controller_title">セレクトコントローラ</string>
     <string name="select_controller_message">ポートに割り当てるコントローラのいずれかのボタンを押してください</string>
     <string name="controller_already_in_use">このコントローラは、すでに使用されています！</string>
@@ -77,4 +81,4 @@
     <!-- Content Description -->
     <string name="desc_list_item_icon">Item Icon</string>
 
-</resources>
\ No newline at end of file
+</resources>
diff --git a/shell/android/res/values/strings.xml b/shell/android/res/values/strings.xml
index 38708adc1..38cefe44d 100644
--- a/shell/android/res/values/strings.xml
+++ b/shell/android/res/values/strings.xml
@@ -31,14 +31,14 @@
     <string name="customize_touch_controls">Customize Touch Controls</string>
     <string name="launch_editor">Launch Editor</string>
     <string name="touch_vibration">Touch Vibration</string>
-    <string name="controller_1">Controller 1</string>
-    <string name="controller_2">Controller 2</string>
-    <string name="controller_3">Controller 3</string>
-    <string name="controller_4">Controller 4</string>
+    <string name="controller_a">Controller A</string>
+    <string name="controller_b">Controller B</string>
+    <string name="controller_c">Controller C</string>
+    <string name="controller_d">Controller D</string>
     <string name="controller_not_connected">Controller Not Connected</string>
     <string name="controller_none_selected">No Controller Selected</string>
-    <string name="select_controller">Select Controller</string>
-    <string name="remove_controller">Remove Controller</string>
+    <string name="select">Select</string>
+    <string name="remove">Remove</string>
     <string name="select_controller_title">Select Controller</string>
     <string name="select_controller_message">Press any button on the controller to assign to port</string>
     <string name="controller_already_in_use">This controller is already in use!</string>
@@ -67,7 +67,7 @@
         <item>Browser</item>
         <item>Settings</item>
         <item>Paths</item>
-        <item>Controllers</item>
+        <item>Input</item>
         <item>About</item>
     </string-array>
 
@@ -77,7 +77,7 @@
         <item>@drawable/disk_unknown</item>
         <item>@drawable/config</item>
         <item>@drawable/open_folder</item>
-        <item>@drawable/config</item>
+        <item>@drawable/input</item>
         <item>@drawable/question</item>
     </array>
 
diff --git a/shell/android/src/com/reicast/emulator/ControllersFragment.java b/shell/android/src/com/reicast/emulator/InputFragment.java
similarity index 98%
rename from shell/android/src/com/reicast/emulator/ControllersFragment.java
rename to shell/android/src/com/reicast/emulator/InputFragment.java
index 74b7cd0e8..7f798c733 100644
--- a/shell/android/src/com/reicast/emulator/ControllersFragment.java
+++ b/shell/android/src/com/reicast/emulator/InputFragment.java
@@ -25,7 +25,7 @@ import android.widget.Toast;
 import android.widget.CompoundButton.OnCheckedChangeListener;
 
 @TargetApi(Build.VERSION_CODES.JELLY_BEAN)
-public class ControllersFragment extends Fragment {
+public class InputFragment extends Fragment {
 
 	private Activity parentActivity;
 	private int listenForButton = 0;
@@ -42,7 +42,7 @@ public class ControllersFragment extends Fragment {
 	public View onCreateView(LayoutInflater inflater, ViewGroup container,
 			Bundle savedInstanceState) {
 		// Inflate the layout for this fragment
-		return inflater.inflate(R.layout.controllers_fragment, container, false);
+		return inflater.inflate(R.layout.input_fragment, container, false);
 	}
 
 	@Override
diff --git a/shell/android/src/com/reicast/emulator/MainActivity.java b/shell/android/src/com/reicast/emulator/MainActivity.java
index 93640a6f4..3ec5b8e2e 100644
--- a/shell/android/src/com/reicast/emulator/MainActivity.java
+++ b/shell/android/src/com/reicast/emulator/MainActivity.java
@@ -121,7 +121,7 @@ public class MainActivity extends FragmentActivity implements
 			// Paths
 			navDrawerItems.add(new NavDrawerItem(navMenuTitles[2], navMenuIcons
 					.getResourceId(2, 0)));
-			// Controllers
+			// Input
 			navDrawerItems.add(new NavDrawerItem(navMenuTitles[3], navMenuIcons
 					.getResourceId(3, 0)));
 			// About
@@ -437,15 +437,15 @@ public class MainActivity extends FragmentActivity implements
 			frag_tag = "OPTIONS_FRAG";
 			break;
 		case 3:
-			fragment = (ControllersFragment) getSupportFragmentManager()
-					.findFragmentByTag("CONTROLLERS_FRAG");
+			fragment = (InputFragment) getSupportFragmentManager()
+					.findFragmentByTag("INPUT_FRAG");
 			if (fragment != null) {
 				if (fragment.isVisible()) {
 					return;
 				}
 			}
-			fragment = new ControllersFragment();
-			frag_tag = "CONTROLLERS_FRAG";
+			fragment = new InputFragment();
+			frag_tag = "INPUT_FRAG";
 			break;
 		case 4:
 			fragment = null;