diff --git a/P3D/Screens/Inventory/PokegearScreen.vb b/P3D/Screens/Inventory/PokegearScreen.vb
index f0665529f..f9f1fc2a6 100644
--- a/P3D/Screens/Inventory/PokegearScreen.vb
+++ b/P3D/Screens/Inventory/PokegearScreen.vb
@@ -184,7 +184,7 @@
             End Select
 
             If Me.menuIndex <> MenuScreens.TradeRequest Then
-                If KeyBoardHandler.KeyPressed(KeyBindings.SpecialKey) = True Or ControllerHandler.ButtonPressed(Buttons.Y) = True Then
+                If KeyBoardHandler.KeyPressed(KeyBindings.SpecialKey) = True Or ControllerHandler.ButtonPressed(Buttons.Back) = True Then
                     If Me.menuIndex <> MenuScreens.UserView Then Player.Temp.LastPokegearPage = Me.menuIndex
                     SoundManager.PlaySound("Pokegear\pokegear_off")
                     Core.SetScreen(Me.PreScreen)
diff --git a/P3D/Screens/MapPreview/MapPreviewScreen.vb b/P3D/Screens/MapPreview/MapPreviewScreen.vb
index be0055c0f..8b40965f8 100644
--- a/P3D/Screens/MapPreview/MapPreviewScreen.vb
+++ b/P3D/Screens/MapPreview/MapPreviewScreen.vb
@@ -194,7 +194,7 @@
         End If
         Core.GameOptions.LoadOffsetMaps = Core.GameOptions.LoadOffsetMaps.Clamp(0, 100)
 
-        If KeyBoardHandler.KeyPressed(Keys.R) = True Or ControllerHandler.ButtonPressed(Buttons.Y) = True Then
+        If KeyBoardHandler.KeyPressed(Keys.R) = True Or ControllerHandler.ButtonPressed(Buttons.Back) = True Then
             Core.OffsetMaps.Clear()
             Level.Load(Level.LevelFile)
         End If
diff --git a/P3D/Screens/PC/HallOfFameScreen.vb b/P3D/Screens/PC/HallOfFameScreen.vb
index 956761623..5c52cae1c 100644
--- a/P3D/Screens/PC/HallOfFameScreen.vb
+++ b/P3D/Screens/PC/HallOfFameScreen.vb
@@ -304,7 +304,7 @@
     End Sub
 
     Private Sub UpdateMenu()
-        If KeyBoardHandler.KeyPressed(KeyBindings.SpecialKey) = True Or ControllerHandler.ButtonPressed(Buttons.Y) = True Then
+        If KeyBoardHandler.KeyPressed(KeyBindings.SpecialKey) = True Or ControllerHandler.ButtonPressed(Buttons.Back) = True Then
             Me.Entries.Reverse()
         End If
 
diff --git a/P3D/Screens/PC/StorageSystemScreen.vb b/P3D/Screens/PC/StorageSystemScreen.vb
index 837f03f64..dd0ec5b10 100644
--- a/P3D/Screens/PC/StorageSystemScreen.vb
+++ b/P3D/Screens/PC/StorageSystemScreen.vb
@@ -174,7 +174,7 @@ Public Class StorageSystemScreen
     Public Overrides Sub Update()
         TextBox.Update()
 
-        If ControllerHandler.ButtonPressed(Buttons.Y) = True Or KeyBoardHandler.KeyPressed(KeyBindings.SpecialKey) = True Then
+        If ControllerHandler.ButtonPressed(Buttons.Back) = True Or KeyBoardHandler.KeyPressed(KeyBindings.SpecialKey) = True Then
             Core.SetScreen(New StorageSystemFilterScreen(Me))
         End If
 
@@ -217,13 +217,13 @@ Public Class StorageSystemScreen
                 If CursorMoving = True Then
                     MoveCursor()
                 Else
-                    If ControllerHandler.ButtonPressed(Buttons.RightShoulder) = True Or Controls.Right(True, False, True, False, False, False) = True Then
+                    If ControllerHandler.ButtonPressed(Buttons.RightTrigger) = True Or Controls.Right(True, False, True, False, False, False) = True Then
                         Me.CurrentBox += 1
                         If CurrentBox > Me.Boxes.Count - 1 Then
                             CurrentBox = 0
                         End If
                     End If
-                    If ControllerHandler.ButtonPressed(Buttons.LeftShoulder) = True Or Controls.Left(True, False, True, False, False, False) = True Then
+                    If ControllerHandler.ButtonPressed(Buttons.LeftTrigger) = True Or Controls.Left(True, False, True, False, False, False) = True Then
                         Me.CurrentBox -= 1
                         If CurrentBox < 0 Then
                             CurrentBox = Me.Boxes.Count - 1
diff --git a/P3D/Screens/TradeScreen.vb b/P3D/Screens/TradeScreen.vb
index 86002dd38..98977298e 100644
--- a/P3D/Screens/TradeScreen.vb
+++ b/P3D/Screens/TradeScreen.vb
@@ -607,7 +607,7 @@ Public Class TradeScreen
             Me.Cursor = Me.BuyItemsList.Count - 1
         End If
 
-        If ControllerHandler.ButtonPressed(Buttons.Y) = True Or KeyBoardHandler.KeyPressed(KeyBindings.SpecialKey) = True Then
+        If ControllerHandler.ButtonPressed(Buttons.Back) = True Or KeyBoardHandler.KeyPressed(KeyBindings.SpecialKey) = True Then
             Me.BuyItemsShowDescription = Not Me.BuyItemsShowDescription
         End If
 
@@ -1015,7 +1015,7 @@ Public Class TradeScreen
             End If
         End If
 
-        If ControllerHandler.ButtonPressed(Buttons.Y) = True Or KeyBoardHandler.KeyPressed(KeyBindings.SpecialKey) = True Then
+        If ControllerHandler.ButtonPressed(Buttons.Back) = True Or KeyBoardHandler.KeyPressed(KeyBindings.SpecialKey) = True Then
             Me.SellItemsShowDescription = Not Me.SellItemsShowDescription
         End If
 
diff --git a/P3D/Screens/VoltorbFlipScreen.vb b/P3D/Screens/VoltorbFlipScreen.vb
index 3b1e1d800..61d9227e5 100644
--- a/P3D/Screens/VoltorbFlipScreen.vb
+++ b/P3D/Screens/VoltorbFlipScreen.vb
@@ -880,14 +880,14 @@ TryAgain:
                         End If
 
                         'Cycling through the 4 Memo types (Voltorb, One, Two, Three)
-                        If Controls.Left(True, False, True, False, False, False) = True OrElse ControllerHandler.ButtonPressed(Buttons.LeftShoulder) Then
+                        If Controls.Left(True, False, True, False, False, False) = True OrElse ControllerHandler.ButtonPressed(Buttons.LeftTrigger) Then
                             MemoIndex -= 1
                             If MemoIndex < 0 Then
                                 MemoIndex = 3
                             End If
                             SoundManager.PlaySound("select")
                         End If
-                        If Controls.Right(True, False, True, False, False, False) = True OrElse ControllerHandler.ButtonPressed(Buttons.RightShoulder) Then
+                        If Controls.Right(True, False, True, False, False, False) = True OrElse ControllerHandler.ButtonPressed(Buttons.RightTrigger) Then
                             MemoIndex += 1
                             If MemoIndex > 3 Then
                                 MemoIndex = 0