diff --git a/shell/apple/emulator-ios/emulator/EmulatorView.mm b/shell/apple/emulator-ios/emulator/EmulatorView.mm
index db742c241..94c3b2e98 100644
--- a/shell/apple/emulator-ios/emulator/EmulatorView.mm
+++ b/shell/apple/emulator-ios/emulator/EmulatorView.mm
@@ -48,6 +48,18 @@ extern u8 rt[4],lt[4];
 }
 */
 
+NSInteger a_button = 1;
+NSInteger b_button = 2;
+NSInteger x_button = 3;
+NSInteger y_button = 4;
+NSInteger up_pad = 5;
+NSInteger down_pad = 6;
+NSInteger left_pad = 7;
+NSInteger right_pad = 8;
+NSInteger left_trigger = 9;
+NSInteger right_trigger = 10;
+NSInteger start_button = 11;
+
 - (void)setControlInput:(PadViewController *)input
 {
 	self.controllerView = input;
@@ -56,37 +68,37 @@ extern u8 rt[4],lt[4];
 - (void)handleKeyDown:(UIButton*)button 
 {
 	PadViewController * controller = (PadViewController *)self.controllerView;
-	if (button == controller.img_dpad_l) {
+	if (button == controller.img_dpad_l || button.tag == left_pad) {
 		kcode[0] &= ~(DC_DPAD_LEFT);
 	}
-	if (button == controller.img_dpad_r) {
+	if (button == controller.img_dpad_r || button.tag == right_pad) {
 		kcode[0] &= ~(DC_DPAD_RIGHT);
 	}
-	if (button == controller.img_dpad_u) {
+	if (button == controller.img_dpad_u || button.tag == up_pad) {
 		kcode[0] &= ~(DC_DPAD_UP);
 	}
-	if (button == controller.img_dpad_d) {
+	if (button == controller.img_dpad_d || button.tag == down_pad) {
 		kcode[0] &= ~(DC_DPAD_DOWN);
 	}
-	if (button == controller.img_abxy_a) {
+	if (button == controller.img_abxy_a || button.tag == a_button) {
 		kcode[0] &= ~(DC_BTN_A);
 	}
-	if (button == controller.img_abxy_b) {
+	if (button == controller.img_abxy_b || button.tag == b_button) {
 		kcode[0] &= ~(DC_BTN_B);
 	}
-	if (button == controller.img_abxy_x) {
+	if (button == controller.img_abxy_x || button.tag == x_button) {
 		kcode[0] &= ~(DC_BTN_X);
 	}
-	if (button == controller.img_abxy_y) {
+	if (button == controller.img_abxy_y || button.tag == y_button) {
 		kcode[0] &= ~(DC_BTN_Y);
 	}
-	if (button == controller.img_lt) {
+	if (button == controller.img_lt || button.tag == left_trigger) {
 		kcode[0] &= ~(DC_AXIS_LT);
 	}
-	if (button == controller.img_rt) {
+	if (button == controller.img_rt || button.tag == right_trigger) {
 		kcode[0] &= ~(DC_AXIS_RT);
 	}
-	if (button == controller.img_start) {
+	if (button == controller.img_start || button.tag == start_button) {
 		kcode[0] &= ~(DC_BTN_START);
 	}
 }
@@ -94,37 +106,37 @@ extern u8 rt[4],lt[4];
 - (void)handleKeyUp:(UIButton*)button
 {
 	PadViewController * controller = (PadViewController *)self.controllerView;
-	if (button == controller.img_dpad_l) {
+	if (button == controller.img_dpad_l || button.tag == left_pad) {
 		kcode[0] |= ~(DC_DPAD_LEFT);
 	}
-	if (button == controller.img_dpad_r) {
+	if (button == controller.img_dpad_r || button.tag == right_pad) {
 		kcode[0] |= ~(DC_DPAD_RIGHT);
 	}
-	if (button == controller.img_dpad_u) {
+	if (button == controller.img_dpad_u || button.tag == up_pad) {
 		kcode[0] |= ~(DC_DPAD_UP);
 	}
-	if (button == controller.img_dpad_d) {
+	if (button == controller.img_dpad_d || button.tag == down_pad) {
 		kcode[0] |= ~(DC_DPAD_DOWN);
 	}
-	if (button == controller.img_abxy_a) {
+	if (button == controller.img_abxy_a || button.tag == a_button) {
 		kcode[0] |= (DC_BTN_A);
 	}
-	if (button == controller.img_abxy_b) {
+	if (button == controller.img_abxy_b || button.tag == b_button) {
 		kcode[0] |= (DC_BTN_B);
 	}
-	if (button == controller.img_abxy_x) {
+	if (button == controller.img_abxy_x || button.tag == x_button) {
 		kcode[0] |= (DC_BTN_X);
 	}
-	if (button == controller.img_abxy_y) {
+	if (button == controller.img_abxy_y || button.tag == y_button) {
 		kcode[0] |= (DC_BTN_Y);
 	}
-	if (button == controller.img_lt) {
+	if (button == controller.img_lt || button.tag == left_trigger) {
 		kcode[0] |= (DC_AXIS_LT);
 	}
-	if (button == controller.img_rt) {
+	if (button == controller.img_rt || button.tag == right_trigger) {
 		kcode[0] |= (DC_AXIS_RT);
 	}
-	if (button == controller.img_start) {
+	if (button == controller.img_start || button.tag == start_button) {
 		kcode[0] |= (DC_BTN_START);
 	}
 }
diff --git a/shell/apple/emulator-ios/emulator/PadViewController.xib b/shell/apple/emulator-ios/emulator/PadViewController.xib
index 724922aed..e947aacef 100644
--- a/shell/apple/emulator-ios/emulator/PadViewController.xib
+++ b/shell/apple/emulator-ios/emulator/PadViewController.xib
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="7706" systemVersion="14E46" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="7706" systemVersion="14F2109" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none">
     <dependencies>
         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7703"/>
     </dependencies>
@@ -29,7 +29,7 @@
                     <rect key="frame" x="0.0" y="0.0" width="80" height="40"/>
                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                 </imageView>
-                <button opaque="NO" multipleTouchEnabled="YES" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="8Gl-Iv-u8L" userLabel="LT-Button">
+                <button opaque="NO" multipleTouchEnabled="YES" tag="9" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="8Gl-Iv-u8L" userLabel="LT-Button">
                     <rect key="frame" x="0.0" y="0.0" width="80" height="40"/>
                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                     <state key="normal">
@@ -44,7 +44,7 @@
                     <rect key="frame" x="488" y="0.0" width="80" height="40"/>
                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                 </imageView>
-                <button opaque="NO" multipleTouchEnabled="YES" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="V8J-vG-dlF" userLabel="RT-Button">
+                <button opaque="NO" multipleTouchEnabled="YES" tag="10" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="V8J-vG-dlF" userLabel="RT-Button">
                     <rect key="frame" x="488" y="0.0" width="80" height="40"/>
                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                     <state key="normal">
@@ -67,7 +67,7 @@
                     <rect key="frame" x="0.0" y="44" width="140" height="140"/>
                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                 </imageView>
-                <button opaque="NO" multipleTouchEnabled="YES" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="rp6-Nd-1qa" userLabel="L-Button">
+                <button opaque="NO" multipleTouchEnabled="YES" tag="7" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="rp6-Nd-1qa" userLabel="L-Button">
                     <rect key="frame" x="0.0" y="94" width="46" height="40"/>
                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                     <state key="normal">
@@ -78,7 +78,7 @@
                         <action selector="keycodeUp:" destination="-1" eventType="touchUpInside" id="5gI-j0-ANf"/>
                     </connections>
                 </button>
-                <button opaque="NO" multipleTouchEnabled="YES" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="CVH-hw-R8F" userLabel="R-Button">
+                <button opaque="NO" multipleTouchEnabled="YES" tag="8" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="CVH-hw-R8F" userLabel="R-Button">
                     <rect key="frame" x="94" y="94" width="46" height="40"/>
                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                     <state key="normal">
@@ -89,7 +89,7 @@
                         <action selector="keycodeUp:" destination="-1" eventType="touchUpInside" id="woi-3Y-IfD"/>
                     </connections>
                 </button>
-                <button opaque="NO" multipleTouchEnabled="YES" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="WMD-Fv-ibu" userLabel="U-Button">
+                <button opaque="NO" multipleTouchEnabled="YES" tag="5" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="WMD-Fv-ibu" userLabel="U-Button">
                     <rect key="frame" x="50" y="44" width="40" height="40"/>
                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                     <state key="normal">
@@ -100,7 +100,7 @@
                         <action selector="keycodeUp:" destination="-1" eventType="touchUpInside" id="R0R-dl-GAG"/>
                     </connections>
                 </button>
-                <button opaque="NO" multipleTouchEnabled="YES" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="s7g-nq-lRU" userLabel="D-Button">
+                <button opaque="NO" multipleTouchEnabled="YES" tag="6" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="s7g-nq-lRU" userLabel="D-Button">
                     <rect key="frame" x="50" y="144" width="40" height="40"/>
                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                     <state key="normal">
@@ -115,7 +115,7 @@
                     <rect key="frame" x="408" y="159" width="160" height="161"/>
                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                 </imageView>
-                <button opaque="NO" multipleTouchEnabled="YES" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="iwO-7q-c8H" userLabel="X-Button">
+                <button opaque="NO" multipleTouchEnabled="YES" tag="3" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="iwO-7q-c8H" userLabel="X-Button">
                     <rect key="frame" x="408" y="210" width="60" height="60"/>
                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                     <state key="normal">
@@ -126,7 +126,7 @@
                         <action selector="keycodeUp:" destination="-1" eventType="touchUpInside" id="dhr-NT-lcF"/>
                     </connections>
                 </button>
-                <button opaque="NO" multipleTouchEnabled="YES" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="7LB-OY-vh3" userLabel="B-Button">
+                <button opaque="NO" multipleTouchEnabled="YES" tag="2" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="7LB-OY-vh3" userLabel="B-Button">
                     <rect key="frame" x="508" y="210" width="60" height="60"/>
                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                     <state key="normal">
@@ -137,7 +137,7 @@
                         <action selector="keycodeUp:" destination="-1" eventType="touchUpInside" id="zqg-KK-Wxb"/>
                     </connections>
                 </button>
-                <button opaque="NO" multipleTouchEnabled="YES" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="hGZ-v7-VA5" userLabel="Y-Button">
+                <button opaque="NO" multipleTouchEnabled="YES" tag="4" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="hGZ-v7-VA5" userLabel="Y-Button">
                     <rect key="frame" x="458" y="159" width="60" height="60"/>
                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                     <state key="normal">
@@ -148,7 +148,7 @@
                         <action selector="keycodeUp:" destination="-1" eventType="touchUpInside" id="oai-Xb-scl"/>
                     </connections>
                 </button>
-                <button opaque="NO" multipleTouchEnabled="YES" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="iKO-3z-Ias" userLabel="A-Button">
+                <button opaque="NO" multipleTouchEnabled="YES" tag="1" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="iKO-3z-Ias" userLabel="A-Button">
                     <rect key="frame" x="458" y="260" width="60" height="60"/>
                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                     <state key="normal">
@@ -163,7 +163,7 @@
                     <rect key="frame" x="244" y="272" width="80" height="40"/>
                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                 </imageView>
-                <button opaque="NO" multipleTouchEnabled="YES" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="VtI-tC-PSX" userLabel="S-Button">
+                <button opaque="NO" multipleTouchEnabled="YES" tag="11" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="VtI-tC-PSX" userLabel="S-Button">
                     <rect key="frame" x="257" y="272" width="54" height="40"/>
                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                     <state key="normal">