diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/MainPresenter.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/MainPresenter.java
index b0f9358852..ecffb14ac0 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/MainPresenter.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/MainPresenter.java
@@ -56,8 +56,11 @@ public final class MainPresenter
 
 			case R.id.menu_settings_wiimote:
 				mView.launchSettingsActivity(SettingsFile.FILE_NAME_WIIMOTE);
+				return true;
 
 			case R.id.menu_refresh:
+				GameDatabase databaseHelper = DolphinApplication.databaseHelper;
+				databaseHelper.scanLibrary(databaseHelper.getWritableDatabase());
 				mView.refresh();
 				return true;
 
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/SettingsActivityView.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/SettingsActivityView.java
index 8276077505..62bb51a9a2 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/SettingsActivityView.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/SettingsActivityView.java
@@ -80,7 +80,7 @@ public interface SettingsActivityView
 	void onGcPadSettingChanged(String key, int value);
 
 	/**
-	 * Called by a containing Fragment tell the containing Activity that a Wiimote's setting
+	 * Called by a containing Fragment to tell the containing Activity that a Wiimote's setting
 	 * was modified.
 	 *
 	 * @param section Identifier for Wiimote that was modified; Wiimotes are identified by their section,
diff --git a/Source/Android/app/src/main/res/drawable-hdpi/ic_settings_wiimote.png b/Source/Android/app/src/main/res/drawable-hdpi/ic_settings_wiimote.png
new file mode 100644
index 0000000000..acd29054c7
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-hdpi/ic_settings_wiimote.png differ
diff --git a/Source/Android/app/src/main/res/drawable-mdpi/ic_settings_wiimote.png b/Source/Android/app/src/main/res/drawable-mdpi/ic_settings_wiimote.png
new file mode 100644
index 0000000000..0f6d19efb1
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-mdpi/ic_settings_wiimote.png differ
diff --git a/Source/Android/app/src/main/res/drawable-xhdpi/ic_settings_wiimote.png b/Source/Android/app/src/main/res/drawable-xhdpi/ic_settings_wiimote.png
new file mode 100644
index 0000000000..18d80a7f28
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-xhdpi/ic_settings_wiimote.png differ
diff --git a/Source/Android/app/src/main/res/drawable-xxhdpi/ic_settings_wiimote.png b/Source/Android/app/src/main/res/drawable-xxhdpi/ic_settings_wiimote.png
new file mode 100644
index 0000000000..6dfcad3797
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-xxhdpi/ic_settings_wiimote.png differ
diff --git a/Source/Android/app/src/main/res/drawable-xxxhdpi/ic_settings_wiimote.png b/Source/Android/app/src/main/res/drawable-xxxhdpi/ic_settings_wiimote.png
new file mode 100644
index 0000000000..489f5f5eb6
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-xxxhdpi/ic_settings_wiimote.png differ
diff --git a/Source/Android/app/src/main/res/drawable/ic_settings_wiimote.png b/Source/Android/app/src/main/res/drawable/ic_settings_wiimote.png
new file mode 100644
index 0000000000..489f5f5eb6
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable/ic_settings_wiimote.png differ
diff --git a/Source/Android/app/src/main/res/values/arrays.xml b/Source/Android/app/src/main/res/values/arrays.xml
index 25cbec179a..4335648861 100644
--- a/Source/Android/app/src/main/res/values/arrays.xml
+++ b/Source/Android/app/src/main/res/values/arrays.xml
@@ -162,7 +162,7 @@
     <string-array name="wiimoteTypeEntries">
         <item>Disabled</item>
         <item>Emulated</item>
-        <item>"Real Wiimote (DolphinBar required)"</item>
+        <item>Real Wiimote (DolphinBar required)</item>
     </string-array>
     <integer-array name="wiimoteTypeValues">
         <item>0</item>
diff --git a/Source/Android/app/src/main/res/values/strings.xml b/Source/Android/app/src/main/res/values/strings.xml
index 60acc28c70..40b6b5aa22 100644
--- a/Source/Android/app/src/main/res/values/strings.xml
+++ b/Source/Android/app/src/main/res/values/strings.xml
@@ -79,7 +79,8 @@
     <string name="controller_gc">GameCube Controllers</string>
     <string name="controller_wii">Wii Controllers (Wiimotes)</string>
 
-    <!-- WARNING Do not move these controller entries AT ALL COSTS! -->
+    <!-- WARNING Do not move these controller entries AT ALL COSTS! They are indexed with ints, and an assumption
+            is made that they are placed together so that we can access them sequentially in a loop. -->
     <string name="controller_0">GameCube Controller 1</string>
     <string name="controller_1">GameCube Controller 2</string>
     <string name="controller_2">GameCube Controller 3</string>
@@ -96,7 +97,8 @@
     <string name="analog_radius">Analog Radius (High value = High sensitivity)</string>
     <string name="analog_threshold">Analog Threshold (Low value = High sensitivity)</string>
 
-    <!-- WARNING Do not move these controller entries AT ALL COSTS! -->
+    <!-- WARNING Do not move these controller entries AT ALL COSTS! They are indexed with ints, and an assumption
+            is made that they are placed together so that we can access them sequentially in a loop. -->
     <string name="wiimote_0">Wiimote 1</string>
     <string name="wiimote_1">Wiimote 2</string>
     <string name="wiimote_2">Wiimote 3</string>