diff --git a/src/g_game.c b/src/g_game.c
index b4a127a73149eb5e7f5cb09b087f291ae775f89e..c832af0a5e234c1844a4e6586fbc8d5bfa9b80be 100644
--- a/src/g_game.c
+++ b/src/g_game.c
@@ -297,10 +297,10 @@ CV_PossibleValue_t joyaxis_cons_t[] = {{0, "None"},
 #ifndef OLD_GAMEPAD_AXES
 #define MOVEAXIS_DEFAULT "Left Stick Y"
 #define SIDEAXIS_DEFAULT "Left Stick X"
-#define LOOKAXIS_DEFAULT "Right Stick Y-"
+#define LOOKAXIS_DEFAULT "Right Stick Y"
 #define TURNAXIS_DEFAULT "Right Stick X"
-#define FIREAXIS_DEFAULT "Right Trigger"
-#define FIRENAXIS_DEFAULT "Left Trigger"
+#define FIREAXIS_DEFAULT "None"
+#define FIRENAXIS_DEFAULT "None"
 #else
 #define MOVEAXIS_DEFAULT "Y-Axis"
 #define SIDEAXIS_DEFAULT "X-Axis"
diff --git a/src/g_input.c b/src/g_input.c
index 465db0316bfe726b0eafaf9fc70511031c54a6ea..4222951fac258c75e3747e68ca1464e6d17e1934 100644
--- a/src/g_input.c
+++ b/src/g_input.c
@@ -1377,15 +1377,17 @@ void G_DefineDefaultControls(void)
 		gamecontroldefault[i][GC_CUSTOM1    ][1] = GAMEPAD_KEY(B); // B
 		gamecontroldefault[i][GC_CUSTOM2    ][1] = GAMEPAD_KEY(Y); // Y
 		gamecontroldefault[i][GC_CUSTOM3    ][1] = GAMEPAD_KEY(LEFTSTICK); // Left Stick
-		gamecontroldefault[i][GC_CENTERVIEW ][1] = GAMEPAD_KEY(RIGHTSTICK); // Right Stick
-		gamecontroldefault[i][GC_WEAPONPREV ][1] = GAMEPAD_KEY(LEFTSHOULDER); // LB
-		gamecontroldefault[i][GC_WEAPONNEXT ][1] = GAMEPAD_KEY(RIGHTSHOULDER); // RB
+		gamecontroldefault[i][GC_CENTERVIEW ][1] = GAMEPAD_KEY(RIGHTSHOULDER); // R1
+		gamecontroldefault[i][GC_CAMTOGGLE  ][1] = GAMEPAD_KEY(LEFTSHOULDER); // L1
 		gamecontroldefault[i][GC_SCREENSHOT ][1] = GAMEPAD_KEY(BACK); // Back
 		gamecontroldefault[i][GC_SYSTEMMENU ][0] = GAMEPAD_KEY(START); // Start
-		gamecontroldefault[i][GC_CAMTOGGLE  ][1] = GAMEPAD_KEY(DPAD_UP); // D-Pad Up
-		gamecontroldefault[i][GC_VIEWPOINTNEXT][1] = GAMEPAD_KEY(DPAD_DOWN); // D-Pad Down
-		gamecontroldefault[i][GC_TOSSFLAG   ][1] = GAMEPAD_KEY(DPAD_LEFT); // D-Pad Left
-		gamecontroldefault[i][GC_SCORES     ][1] = GAMEPAD_KEY(DPAD_RIGHT); // D-Pad Right
+		gamecontroldefault[i][GC_TOSSFLAG   ][1] = GAMEPAD_KEY(DPAD_UP); // D-Pad Up
+		gamecontroldefault[i][GC_WEAPONPREV ][1] = GAMEPAD_KEY(DPAD_LEFT); // D-Pad Left
+		gamecontroldefault[i][GC_WEAPONNEXT ][1] = GAMEPAD_KEY(DPAD_RIGHT); // D-Pad Right
+		gamecontroldefault[i][GC_SCORES     ][1] = GAMEPAD_KEY(DPAD_DOWN); // D-Pad Down
+		gamecontroldefault[i][GC_VIEWPOINTNEXT][1] = GAMEPAD_KEY(RIGHTSTICK); // Right Stick
+		gamecontroldefault[i][GC_FIRE       ][1] = GAMEPAD_AXIS(TRIGGERRIGHT); // R2
+		gamecontroldefault[i][GC_FIRENORMAL ][1] = GAMEPAD_AXIS(TRIGGERLEFT); // L2
 
 		// Second player only has gamepad defaults
 		gamecontrolbisdefault[i][GC_JUMP       ][1] = GAMEPAD_KEY(A); // A
@@ -1393,15 +1395,17 @@ void G_DefineDefaultControls(void)
 		gamecontrolbisdefault[i][GC_CUSTOM1    ][1] = GAMEPAD_KEY(B); // B
 		gamecontrolbisdefault[i][GC_CUSTOM2    ][1] = GAMEPAD_KEY(Y); // Y
 		gamecontrolbisdefault[i][GC_CUSTOM3    ][1] = GAMEPAD_KEY(LEFTSTICK); // Left Stick
-		gamecontrolbisdefault[i][GC_CENTERVIEW ][1] = GAMEPAD_KEY(RIGHTSTICK); // Right Stick
-		gamecontrolbisdefault[i][GC_WEAPONPREV ][1] = GAMEPAD_KEY(LEFTSHOULDER); // LB
-		gamecontrolbisdefault[i][GC_WEAPONNEXT ][1] = GAMEPAD_KEY(RIGHTSHOULDER); // RB
+		gamecontrolbisdefault[i][GC_CENTERVIEW ][1] = GAMEPAD_KEY(RIGHTSHOULDER); // R1
+		gamecontrolbisdefault[i][GC_CAMTOGGLE  ][1] = GAMEPAD_KEY(LEFTSHOULDER); // L1
 		gamecontrolbisdefault[i][GC_SCREENSHOT ][1] = GAMEPAD_KEY(BACK); // Back
 		//gamecontrolbisdefault[i][GC_SYSTEMMENU ][0] = GAMEPAD_KEY(START); // Start
-		gamecontrolbisdefault[i][GC_CAMTOGGLE  ][1] = GAMEPAD_KEY(DPAD_UP); // D-Pad Up
-		gamecontrolbisdefault[i][GC_VIEWPOINTNEXT][1] = GAMEPAD_KEY(DPAD_DOWN); // D-Pad Down
-		gamecontrolbisdefault[i][GC_TOSSFLAG   ][1] = GAMEPAD_KEY(DPAD_LEFT); // D-Pad Left
-		//gamecontrolbisdefault[i][GC_SCORES     ][1] = GAMEPAD_KEY(DPAD_RIGHT); // D-Pad Right
+		gamecontrolbisdefault[i][GC_TOSSFLAG   ][1] = GAMEPAD_KEY(DPAD_UP); // D-Pad Up
+		gamecontrolbisdefault[i][GC_WEAPONPREV ][1] = GAMEPAD_KEY(DPAD_LEFT); // D-Pad Left
+		gamecontrolbisdefault[i][GC_WEAPONNEXT ][1] = GAMEPAD_KEY(DPAD_RIGHT); // D-Pad Right
+		//gamecontrolbisdefault[i][GC_SCORES     ][1] = GAMEPAD_KEY(DPAD_DOWN); // D-Pad Down
+		gamecontrolbisdefault[i][GC_VIEWPOINTNEXT][1] = GAMEPAD_KEY(RIGHTSTICK); // Right Stick
+		gamecontrolbisdefault[i][GC_FIRE       ][1] = GAMEPAD_AXIS(TRIGGERRIGHT); // R2
+		gamecontrolbisdefault[i][GC_FIRENORMAL ][1] = GAMEPAD_AXIS(TRIGGERLEFT); // L2
 	}
 }
 
diff --git a/src/g_input.h b/src/g_input.h
index fe623034a87e3e7a8137cf7e5e215a9c0ec994fb..9d393fee1fc2112e6dc691aa7142c09377064152 100644
--- a/src/g_input.h
+++ b/src/g_input.h
@@ -188,6 +188,7 @@ typedef enum
 } key_input_e;
 
 #define GAMEPAD_KEY(key) (KEY_GAMEPAD + GAMEPAD_BUTTON_##key)
+#define GAMEPAD_AXIS(key) (KEY_AXES + GAMEPAD_AXIS_##key)
 
 typedef enum
 {