diff --git a/source/button_mapping.h b/source/button_mapping.h
index b4dcd08..6ab0828 100644
--- a/source/button_mapping.h
+++ b/source/button_mapping.h
@@ -20,7 +20,7 @@ enum {
 	CTRLR_WUPC
 };
 
-const char ctrlrName[5][0x20] =
+const char ctrlrName[5][32] =
 { "GameCube Controller", "Wiimote", "Nunchuk + Wiimote", "Classic Controller", "Wii U Pro Controller" };
 
 typedef struct _btn_map {
diff --git a/source/images/icon_settings_wiiupro.png b/source/images/icon_settings_wiiupro.png
index 69eeeed..e9fdad8 100644
Binary files a/source/images/icon_settings_wiiupro.png and b/source/images/icon_settings_wiiupro.png differ
diff --git a/source/menu.cpp b/source/menu.cpp
index 87cff49..1700382 100644
--- a/source/menu.cpp
+++ b/source/menu.cpp
@@ -2280,15 +2280,15 @@ ButtonMappingWindow()
 			sprintf(msg, "Press any button on the GameCube Controller now. Press the C-Stick in any direction to clear the existing mapping.");
 			#endif
 			break;
-		case CTRLR_WUPC:
-			sprintf(msg, "Press any button on the Wii U Pro Controller now. Press Home to clear the existing mapping.");
-			break;
 		case CTRLR_WIIMOTE:
 			sprintf(msg, "Press any button on the Wiimote now. Press Home to clear the existing mapping.");
 			break;
 		case CTRLR_CLASSIC:
 			sprintf(msg, "Press any button on the Classic Controller now. Press Home to clear the existing mapping.");
 			break;
+		case CTRLR_WUPC:
+			sprintf(msg, "Press any button on the Wii U Pro Controller now. Press Home to clear the existing mapping.");
+			break;
 		case CTRLR_NUNCHUK:
 			sprintf(msg, "Press any button on the Wiimote or Nunchuk now. Press Home to clear the existing mapping.");
 			break;