From 8224a6a38156ccba7c69b66fab3388463fc727b1 Mon Sep 17 00:00:00 2001
From: Sergeanur <s.anureev@yandex.ua>
Date: Thu, 5 Nov 2020 17:05:16 +0200
Subject: [PATCH] Button icons

---
 gamefiles/models/x360btns.txd | Bin 0 -> 126760 bytes
 src/core/ControllerConfig.cpp | 569 ++++++++++++----------------------
 src/core/config.h             |   1 +
 src/render/Font.cpp           | 172 +++++++++-
 src/render/Font.h             |  33 ++
 5 files changed, 403 insertions(+), 372 deletions(-)
 create mode 100644 gamefiles/models/x360btns.txd

diff --git a/gamefiles/models/x360btns.txd b/gamefiles/models/x360btns.txd
new file mode 100644
index 0000000000000000000000000000000000000000..27837c2fd71f7f86ab653b5b42358598b3285178
GIT binary patch
literal 126760
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
P!~SgIaoZo<fB*jhE_WZB

literal 0
HcmV?d00001

diff --git a/src/core/ControllerConfig.cpp b/src/core/ControllerConfig.cpp
index dcc294c8..504b832c 100644
--- a/src/core/ControllerConfig.cpp
+++ b/src/core/ControllerConfig.cpp
@@ -2316,199 +2316,207 @@ int32 CControllerConfigManager::GetNumOfSettingsForAction(e_ControllerAction act
 	return num;
 }
 
-const char *XboxButtons[][MAX_CONTROLLERACTIONS] =
-{
-	{
-		"B",    // PED_FIREWEAPON
-		"RT",   // PED_CYCLE_WEAPON_RIGHT
-		"LT",   // PED_CYCLE_WEAPON_LEFT
-		nil,    // GO_FORWARD
-		nil,    // GO_BACK
-		nil,    // GO_LEFT
-		nil,    // GO_RIGHT
-		"X",    // PED_SNIPER_ZOOM_IN
-		"A",    // PED_SNIPER_ZOOM_OUT
-		"Y",    // VEHICLE_ENTER_EXIT
-		"BACK", // CAMERA_CHANGE_VIEW_ALL_SITUATIONS
-		"X",    // PED_JUMPING
-		"A",    // PED_SPRINT
-		"RS",   // PED_LOOKBEHIND
 #ifdef BIND_VEHICLE_FIREWEAPON
-		"B",   // VEHICLE_FIREWEAPON
+#define VFB(b) b,
+#else
+#define VFB(b)
 #endif
-		"A",  // VEHICLE_ACCELERATE
-		"X",  // VEHICLE_BRAKE
-		"LB", // VEHICLE_CHANGE_RADIO_STATION
-		"LS", // VEHICLE_HORN
-		"RS", // TOGGLE_SUBMISSIONS
-		"RB", // VEHICLE_HANDBRAKE
-		nil,  // PED_1RST_PERSON_LOOK_LEFT
-		nil,  // PED_1RST_PERSON_LOOK_RIGHT
-		"LT", // VEHICLE_LOOKLEFT
-		"RT", // VEHICLE_LOOKRIGHT
-		nil,  // VEHICLE_LOOKBEHIND
-		nil,  // VEHICLE_TURRETLEFT
-		nil,  // VEHICLE_TURRETRIGHT
-		nil,  // VEHICLE_TURRETUP
-		nil,  // VEHICLE_TURRETDOWN
-		"LT", // PED_CYCLE_TARGET_LEFT
-		"RT", // PED_CYCLE_TARGET_RIGHT
-		"LB", // PED_CENTER_CAMERA_BEHIND_PLAYER
-		"RB", // PED_LOCK_TARGET
-		nil,  // NETWORK_TALK
-		nil,  // PED_1RST_PERSON_LOOK_UP
-		nil,  // PED_1RST_PERSON_LOOK_DOWN
-		nil,  // _CONTROLLERACTION_36
-		nil,  // TOGGLE_DPAD
-		nil,  // SWITCH_DEBUG_CAM_ON
-		nil,  // TAKE_SCREEN_SHOT
-		nil,  // SHOW_MOUSE_POINTER_TOGGLE
-	},
-	{
-		"B",    // PED_FIREWEAPON
-		"RT",   // PED_CYCLE_WEAPON_RIGHT
-		"LT",   // PED_CYCLE_WEAPON_LEFT
-		nil,    // GO_FORWARD
-		nil,    // GO_BACK
-		nil,    // GO_LEFT
-		nil,    // GO_RIGHT
-		"X",    // PED_SNIPER_ZOOM_IN
-		"A",    // PED_SNIPER_ZOOM_OUT
-		"Y",    // VEHICLE_ENTER_EXIT
-		"BACK", // CAMERA_CHANGE_VIEW_ALL_SITUATIONS
-		"X",    // PED_JUMPING
-		"A",    // PED_SPRINT
-		"RS",   // PED_LOOKBEHIND
-#ifdef BIND_VEHICLE_FIREWEAPON
-		"B", // VEHICLE_FIREWEAPON
+
+#define CONTROLLER_BUTTONS(T, O, X, Q, L1, L2, L3, R1, R2, R3, SELECT)                                                                                         \
+	{{                                                                                                                                                         \
+	     O,      /* PED_FIREWEAPON */                                                                                                                          \
+	     R2,     /* PED_CYCLE_WEAPON_RIGHT */                                                                                                                  \
+	     L2,     /* PED_CYCLE_WEAPON_LEFT */                                                                                                                   \
+	     nil,    /* GO_FORWARD */                                                                                                                              \
+	     nil,    /* GO_BACK */                                                                                                                                 \
+	     nil,    /* GO_LEFT */                                                                                                                                 \
+	     nil,    /* GO_RIGHT */                                                                                                                                \
+	     Q,      /* PED_SNIPER_ZOOM_IN */                                                                                                                      \
+	     X,      /* PED_SNIPER_ZOOM_OUT */                                                                                                                     \
+	     T,      /* VEHICLE_ENTER_EXIT */                                                                                                                      \
+	     SELECT, /* CAMERA_CHANGE_VIEW_ALL_SITUATIONS */                                                                                                       \
+	     Q,      /* PED_JUMPING */                                                                                                                             \
+	     X,      /* PED_SPRINT */                                                                                                                              \
+	     R3,     /* PED_LOOKBEHIND */                                                                                                                          \
+	     VFB(O)  /* VEHICLE_FIREWEAPON */                                                                                                                      \
+	     X,      /* VEHICLE_ACCELERATE */                                                                                                                      \
+	     Q,      /* VEHICLE_BRAKE */                                                                                                                           \
+	     L1,     /* VEHICLE_CHANGE_RADIO_STATION */                                                                                                            \
+	     L3,     /* VEHICLE_HORN */                                                                                                                            \
+	     R3,     /* TOGGLE_SUBMISSIONS */                                                                                                                      \
+	     R1,     /* VEHICLE_HANDBRAKE */                                                                                                                       \
+	     nil,    /* PED_1RST_PERSON_LOOK_LEFT */                                                                                                               \
+	     nil,    /* PED_1RST_PERSON_LOOK_RIGHT */                                                                                                              \
+	     L2,     /* VEHICLE_LOOKLEFT */                                                                                                                        \
+	     R2,     /* VEHICLE_LOOKRIGHT */                                                                                                                       \
+	     nil,    /* VEHICLE_LOOKBEHIND */                                                                                                                      \
+	     nil,    /* VEHICLE_TURRETLEFT */                                                                                                                      \
+	     nil,    /* VEHICLE_TURRETRIGHT */                                                                                                                     \
+	     nil,    /* VEHICLE_TURRETUP */                                                                                                                        \
+	     nil,    /* VEHICLE_TURRETDOWN */                                                                                                                      \
+	     L2,     /* PED_CYCLE_TARGET_LEFT */                                                                                                                   \
+	     R2,     /* PED_CYCLE_TARGET_RIGHT */                                                                                                                  \
+	     L1,     /* PED_CENTER_CAMERA_BEHIND_PLAYER */                                                                                                         \
+	     R1,     /* PED_LOCK_TARGET */                                                                                                                         \
+	     nil,    /* NETWORK_TALK */                                                                                                                            \
+	     nil,    /* PED_1RST_PERSON_LOOK_UP */                                                                                                                 \
+	     nil,    /* PED_1RST_PERSON_LOOK_DOWN */                                                                                                               \
+	     nil,    /* _CONTROLLERACTION_36 */                                                                                                                    \
+	     nil,    /* TOGGLE_DPAD */                                                                                                                             \
+	     nil,    /* SWITCH_DEBUG_CAM_ON */                                                                                                                     \
+	     nil,    /* TAKE_SCREEN_SHOT */                                                                                                                        \
+	     nil,    /* SHOW_MOUSE_POINTER_TOGGLE */                                                                                                               \
+	 },                                                                                                                                                        \
+	 {                                                                                                                                                         \
+	     O,      /* PED_FIREWEAPON */                                                                                                                          \
+	     R2,     /* PED_CYCLE_WEAPON_RIGHT */                                                                                                                  \
+	     L2,     /* PED_CYCLE_WEAPON_LEFT */                                                                                                                   \
+	     nil,    /* GO_FORWARD */                                                                                                                              \
+	     nil,    /* GO_BACK */                                                                                                                                 \
+	     nil,    /* GO_LEFT */                                                                                                                                 \
+	     nil,    /* GO_RIGHT */                                                                                                                                \
+	     Q,      /* PED_SNIPER_ZOOM_IN */                                                                                                                      \
+	     X,      /* PED_SNIPER_ZOOM_OUT */                                                                                                                     \
+	     T,      /* VEHICLE_ENTER_EXIT */                                                                                                                      \
+	     SELECT, /* CAMERA_CHANGE_VIEW_ALL_SITUATIONS */                                                                                                       \
+	     Q,      /* PED_JUMPING */                                                                                                                             \
+	     X,      /* PED_SPRINT */                                                                                                                              \
+	     R3,     /* PED_LOOKBEHIND */                                                                                                                          \
+	     VFB(O)  /* VEHICLE_FIREWEAPON */                                                                                                                      \
+	     X,      /* VEHICLE_ACCELERATE */                                                                                                                      \
+	     Q,      /* VEHICLE_BRAKE */                                                                                                                           \
+	     SELECT, /* VEHICLE_CHANGE_RADIO_STATION */                                                                                                            \
+	     L1,     /* VEHICLE_HORN */                                                                                                                            \
+	     R3,     /* TOGGLE_SUBMISSIONS */                                                                                                                      \
+	     R1,     /* VEHICLE_HANDBRAKE */                                                                                                                       \
+	     nil,    /* PED_1RST_PERSON_LOOK_LEFT */                                                                                                               \
+	     nil,    /* PED_1RST_PERSON_LOOK_RIGHT */                                                                                                              \
+	     L2,     /* VEHICLE_LOOKLEFT */                                                                                                                        \
+	     R2,     /* VEHICLE_LOOKRIGHT */                                                                                                                       \
+	     nil,    /* VEHICLE_LOOKBEHIND */                                                                                                                      \
+	     nil,    /* VEHICLE_TURRETLEFT */                                                                                                                      \
+	     nil,    /* VEHICLE_TURRETRIGHT */                                                                                                                     \
+	     nil,    /* VEHICLE_TURRETUP */                                                                                                                        \
+	     nil,    /* VEHICLE_TURRETDOWN */                                                                                                                      \
+	     L2,     /* PED_CYCLE_TARGET_LEFT */                                                                                                                   \
+	     R2,     /* PED_CYCLE_TARGET_RIGHT */                                                                                                                  \
+	     L1,     /* PED_CENTER_CAMERA_BEHIND_PLAYER */                                                                                                         \
+	     R1,     /* PED_LOCK_TARGET */                                                                                                                         \
+	     nil,    /* NETWORK_TALK */                                                                                                                            \
+	     nil,    /* PED_1RST_PERSON_LOOK_UP */                                                                                                                 \
+	     nil,    /* PED_1RST_PERSON_LOOK_DOWN */                                                                                                               \
+	     nil,    /* _CONTROLLERACTION_36 */                                                                                                                    \
+	     nil,    /* TOGGLE_DPAD */                                                                                                                             \
+	     nil,    /* SWITCH_DEBUG_CAM_ON */                                                                                                                     \
+	     nil,    /* TAKE_SCREEN_SHOT */                                                                                                                        \
+	     nil,    /* SHOW_MOUSE_POINTER_TOGGLE */                                                                                                               \
+	 },                                                                                                                                                        \
+	 {                                                                                                                                                         \
+	     X,      /* PED_FIREWEAPON */                                                                                                                          \
+	     R2,     /* PED_CYCLE_WEAPON_RIGHT */                                                                                                                  \
+	     L2,     /* PED_CYCLE_WEAPON_LEFT */                                                                                                                   \
+	     nil,    /* GO_FORWARD */                                                                                                                              \
+	     nil,    /* GO_BACK */                                                                                                                                 \
+	     nil,    /* GO_LEFT */                                                                                                                                 \
+	     nil,    /* GO_RIGHT */                                                                                                                                \
+	     T,      /* PED_SNIPER_ZOOM_IN */                                                                                                                      \
+	     Q,      /* PED_SNIPER_ZOOM_OUT */                                                                                                                     \
+	     L1,     /* VEHICLE_ENTER_EXIT */                                                                                                                      \
+	     SELECT, /* CAMERA_CHANGE_VIEW_ALL_SITUATIONS */                                                                                                       \
+	     Q,      /* PED_JUMPING */                                                                                                                             \
+	     O,      /* PED_SPRINT */                                                                                                                              \
+	     R3,     /* PED_LOOKBEHIND */                                                                                                                          \
+	     VFB(O)  /* VEHICLE_FIREWEAPON */                                                                                                                      \
+	     X,      /* VEHICLE_ACCELERATE */                                                                                                                      \
+	     Q,      /* VEHICLE_BRAKE */                                                                                                                           \
+	     L3,     /* VEHICLE_CHANGE_RADIO_STATION */                                                                                                            \
+	     R1,     /* VEHICLE_HORN */                                                                                                                            \
+	     R3,     /* TOGGLE_SUBMISSIONS */                                                                                                                      \
+	     T,      /* VEHICLE_HANDBRAKE */                                                                                                                       \
+	     nil,    /* PED_1RST_PERSON_LOOK_LEFT */                                                                                                               \
+	     nil,    /* PED_1RST_PERSON_LOOK_RIGHT */                                                                                                              \
+	     L2,     /* VEHICLE_LOOKLEFT */                                                                                                                        \
+	     R2,     /* VEHICLE_LOOKRIGHT */                                                                                                                       \
+	     nil,    /* VEHICLE_LOOKBEHIND */                                                                                                                      \
+	     nil,    /* VEHICLE_TURRETLEFT */                                                                                                                      \
+	     nil,    /* VEHICLE_TURRETRIGHT */                                                                                                                     \
+	     nil,    /* VEHICLE_TURRETUP */                                                                                                                        \
+	     nil,    /* VEHICLE_TURRETDOWN */                                                                                                                      \
+	     L2,     /* PED_CYCLE_TARGET_LEFT */                                                                                                                   \
+	     R2,     /* PED_CYCLE_TARGET_RIGHT */                                                                                                                  \
+	     T,      /* PED_CENTER_CAMERA_BEHIND_PLAYER */                                                                                                         \
+	     R1,     /* PED_LOCK_TARGET */                                                                                                                         \
+	     nil,    /* NETWORK_TALK */                                                                                                                            \
+	     nil,    /* PED_1RST_PERSON_LOOK_UP */                                                                                                                 \
+	     nil,    /* PED_1RST_PERSON_LOOK_DOWN */                                                                                                               \
+	     nil,    /* _CONTROLLERACTION_36 */                                                                                                                    \
+	     nil,    /* TOGGLE_DPAD */                                                                                                                             \
+	     nil,    /* SWITCH_DEBUG_CAM_ON */                                                                                                                     \
+	     nil,    /* TAKE_SCREEN_SHOT */                                                                                                                        \
+	     nil,    /* SHOW_MOUSE_POINTER_TOGGLE */                                                                                                               \
+	 },                                                                                                                                                        \
+	 {                                                                                                                                                         \
+	     R1,     /* PED_FIREWEAPON */                                                                                                                          \
+	     R2,     /* PED_CYCLE_WEAPON_RIGHT */                                                                                                                  \
+	     L2,     /* PED_CYCLE_WEAPON_LEFT */                                                                                                                   \
+	     nil,    /* GO_FORWARD */                                                                                                                              \
+	     nil,    /* GO_BACK */                                                                                                                                 \
+	     nil,    /* GO_LEFT */                                                                                                                                 \
+	     nil,    /* GO_RIGHT */                                                                                                                                \
+	     Q,      /* PED_SNIPER_ZOOM_IN */                                                                                                                      \
+	     X,      /* PED_SNIPER_ZOOM_OUT */                                                                                                                     \
+	     T,      /* VEHICLE_ENTER_EXIT */                                                                                                                      \
+	     SELECT, /* CAMERA_CHANGE_VIEW_ALL_SITUATIONS */                                                                                                       \
+	     Q,      /* PED_JUMPING */                                                                                                                             \
+	     X,      /* PED_SPRINT */                                                                                                                              \
+	     R3,     /* PED_LOOKBEHIND */                                                                                                                          \
+	     VFB(R1) /* VEHICLE_FIREWEAPON */                                                                                                                      \
+	     nil,    /* VEHICLE_ACCELERATE */                                                                                                                      \
+	     nil,    /* VEHICLE_BRAKE */                                                                                                                           \
+	     O,      /* VEHICLE_CHANGE_RADIO_STATION */                                                                                                            \
+	     L3,     /* VEHICLE_HORN */                                                                                                                            \
+	     Q,      /* TOGGLE_SUBMISSIONS */                                                                                                                      \
+	     L1,     /* VEHICLE_HANDBRAKE */                                                                                                                       \
+	     nil,    /* PED_1RST_PERSON_LOOK_LEFT */                                                                                                               \
+	     nil,    /* PED_1RST_PERSON_LOOK_RIGHT */                                                                                                              \
+	     L2,     /* VEHICLE_LOOKLEFT */                                                                                                                        \
+	     R2,     /* VEHICLE_LOOKRIGHT */                                                                                                                       \
+	     nil,    /* VEHICLE_LOOKBEHIND */                                                                                                                      \
+	     nil,    /* VEHICLE_TURRETLEFT */                                                                                                                      \
+	     nil,    /* VEHICLE_TURRETRIGHT */                                                                                                                     \
+	     nil,    /* VEHICLE_TURRETUP */                                                                                                                        \
+	     nil,    /* VEHICLE_TURRETDOWN */                                                                                                                      \
+	     L2,     /* PED_CYCLE_TARGET_LEFT */                                                                                                                   \
+	     R2,     /* PED_CYCLE_TARGET_RIGHT */                                                                                                                  \
+	     O,      /* PED_CENTER_CAMERA_BEHIND_PLAYER */                                                                                                         \
+	     L1,     /* PED_LOCK_TARGET */                                                                                                                         \
+	     nil,    /* NETWORK_TALK */                                                                                                                            \
+	     nil,    /* PED_1RST_PERSON_LOOK_UP */                                                                                                                 \
+	     nil,    /* PED_1RST_PERSON_LOOK_DOWN */                                                                                                               \
+	     nil,    /* _CONTROLLERACTION_36 */                                                                                                                    \
+	     nil,    /* TOGGLE_DPAD */                                                                                                                             \
+	     nil,    /* SWITCH_DEBUG_CAM_ON */                                                                                                                     \
+	     nil,    /* TAKE_SCREEN_SHOT */                                                                                                                        \
+	     nil,    /* SHOW_MOUSE_POINTER_TOGGLE */                                                                                                               \
+	 }}
+
+#ifdef BUTTON_ICONS
+const char *XboxButtons[][MAX_CONTROLLERACTIONS] = CONTROLLER_BUTTONS("~T~", "~O~", "~X~", "~Q~", "~K~", "~M~", "~A~", "~J~", "~V~", "~C~", "BACK");
+#else
+const char *XboxButtons[][MAX_CONTROLLERACTIONS] = CONTROLLER_BUTTONS("Y", "B", "A", "X", "LB", "LT", "LS", "RB", "RT", "RS", "BACK");
 #endif
-		"A",    // VEHICLE_ACCELERATE
-		"X",    // VEHICLE_BRAKE
-		"BACK", // VEHICLE_CHANGE_RADIO_STATION
-		"LB",   // VEHICLE_HORN
-		"RS",   // TOGGLE_SUBMISSIONS
-		"RB",   // VEHICLE_HANDBRAKE
-		nil,    // PED_1RST_PERSON_LOOK_LEFT
-		nil,    // PED_1RST_PERSON_LOOK_RIGHT
-		"LT",   // VEHICLE_LOOKLEFT
-		"RT",   // VEHICLE_LOOKRIGHT
-		nil,    // VEHICLE_LOOKBEHIND
-		nil,    // VEHICLE_TURRETLEFT
-		nil,    // VEHICLE_TURRETRIGHT
-		nil,    // VEHICLE_TURRETUP
-		nil,    // VEHICLE_TURRETDOWN
-		"LT",   // PED_CYCLE_TARGET_LEFT
-		"RT",   // PED_CYCLE_TARGET_RIGHT
-		"LB",   // PED_CENTER_CAMERA_BEHIND_PLAYER
-		"RB",   // PED_LOCK_TARGET
-		nil,    // NETWORK_TALK
-		nil,    // PED_1RST_PERSON_LOOK_UP
-		nil,    // PED_1RST_PERSON_LOOK_DOWN
-		nil,    // _CONTROLLERACTION_36
-		nil,    // TOGGLE_DPAD
-		nil,    // SWITCH_DEBUG_CAM_ON
-		nil,    // TAKE_SCREEN_SHOT
-		nil,    // SHOW_MOUSE_POINTER_TOGGLE
-	},
-	{
-		"A",    // PED_FIREWEAPON
-		"RT",   // PED_CYCLE_WEAPON_RIGHT
-		"LT",   // PED_CYCLE_WEAPON_LEFT
-		nil,    // GO_FORWARD
-		nil,    // GO_BACK
-		nil,    // GO_LEFT
-		nil,    // GO_RIGHT
-		"Y",    // PED_SNIPER_ZOOM_IN
-		"X",    // PED_SNIPER_ZOOM_OUT
-		"LB",   // VEHICLE_ENTER_EXIT
-		"BACK", // CAMERA_CHANGE_VIEW_ALL_SITUATIONS
-		"X",    // PED_JUMPING
-		"B",    // PED_SPRINT
-		"RS",   // PED_LOOKBEHIND
-#ifdef BIND_VEHICLE_FIREWEAPON
-		"B",   // VEHICLE_FIREWEAPON
-#endif
-		"A",  // VEHICLE_ACCELERATE
-		"X",  // VEHICLE_BRAKE
-		"LS", // VEHICLE_CHANGE_RADIO_STATION
-		"RB", // VEHICLE_HORN
-		"RS", // TOGGLE_SUBMISSIONS
-		"Y",  // VEHICLE_HANDBRAKE
-		nil,  // PED_1RST_PERSON_LOOK_LEFT
-		nil,  // PED_1RST_PERSON_LOOK_RIGHT
-		"LT", // VEHICLE_LOOKLEFT
-		"RT", // VEHICLE_LOOKRIGHT
-		nil,  // VEHICLE_LOOKBEHIND
-		nil,  // VEHICLE_TURRETLEFT
-		nil,  // VEHICLE_TURRETRIGHT
-		nil,  // VEHICLE_TURRETUP
-		nil,  // VEHICLE_TURRETDOWN
-		"LT", // PED_CYCLE_TARGET_LEFT
-		"RT", // PED_CYCLE_TARGET_RIGHT
-		"Y",  // PED_CENTER_CAMERA_BEHIND_PLAYER
-		"RB", // PED_LOCK_TARGET
-		nil,  // NETWORK_TALK
-		nil,  // PED_1RST_PERSON_LOOK_UP
-		nil,  // PED_1RST_PERSON_LOOK_DOWN
-		nil,  // _CONTROLLERACTION_36
-		nil,  // TOGGLE_DPAD
-		nil,  // SWITCH_DEBUG_CAM_ON
-		nil,  // TAKE_SCREEN_SHOT
-		nil,  // SHOW_MOUSE_POINTER_TOGGLE
-	},
-	{
-		"RB",   // PED_FIREWEAPON
-		"RT",   // PED_CYCLE_WEAPON_RIGHT
-		"LT",   // PED_CYCLE_WEAPON_LEFT
-		nil,    // GO_FORWARD
-		nil,    // GO_BACK
-		nil,    // GO_LEFT
-		nil,    // GO_RIGHT
-		"X",    // PED_SNIPER_ZOOM_IN
-		"A",    // PED_SNIPER_ZOOM_OUT
-		"Y",    // VEHICLE_ENTER_EXIT
-		"BACK", // CAMERA_CHANGE_VIEW_ALL_SITUATIONS
-		"X",    // PED_JUMPING
-		"A",    // PED_SPRINT
-		"RS",   // PED_LOOKBEHIND
-#ifdef BIND_VEHICLE_FIREWEAPON
-		"RB",   // VEHICLE_FIREWEAPON
-#endif
-		nil,  // VEHICLE_ACCELERATE
-		nil,  // VEHICLE_BRAKE
-		"B",  // VEHICLE_CHANGE_RADIO_STATION
-		"LS", // VEHICLE_HORN
-		"X",  // TOGGLE_SUBMISSIONS
-		"LB", // VEHICLE_HANDBRAKE
-		nil,  // PED_1RST_PERSON_LOOK_LEFT
-		nil,  // PED_1RST_PERSON_LOOK_RIGHT
-		"LT", // VEHICLE_LOOKLEFT
-		"RT", // VEHICLE_LOOKRIGHT
-		nil,  // VEHICLE_LOOKBEHIND
-		nil,  // VEHICLE_TURRETLEFT
-		nil,  // VEHICLE_TURRETRIGHT
-		nil,  // VEHICLE_TURRETUP
-		nil,  // VEHICLE_TURRETDOWN
-		"LT", // PED_CYCLE_TARGET_LEFT
-		"RT", // PED_CYCLE_TARGET_RIGHT
-		"B",  // PED_CENTER_CAMERA_BEHIND_PLAYER
-		"LB", // PED_LOCK_TARGET
-		nil,  // NETWORK_TALK
-		nil,  // PED_1RST_PERSON_LOOK_UP
-		nil,  // PED_1RST_PERSON_LOOK_DOWN
-		nil,  // _CONTROLLERACTION_36
-		nil,  // TOGGLE_DPAD
-		nil,  // SWITCH_DEBUG_CAM_ON
-		nil,  // TAKE_SCREEN_SHOT
-		nil,  // SHOW_MOUSE_POINTER_TOGGLE
-	}
-};
+
 
 #if 0 // set 1 for ps2 fonts
 #define PS2_TRIANGLE "\""
 #define PS2_CIRCLE "|"
 #define PS2_CROSS "/"
 #define PS2_SQUARE "^"
+#elif defined(BUTTON_ICONS)
+#define PS2_TRIANGLE "~T~"
+#define PS2_CIRCLE "~O~"
+#define PS2_CROSS "~X~"
+#define PS2_SQUARE "~Q~"
 #else
 #define PS2_TRIANGLE "TRIANGLE"
 #define PS2_CIRCLE "CIRCLE"
@@ -2516,199 +2524,22 @@ const char *XboxButtons[][MAX_CONTROLLERACTIONS] =
 #define PS2_SQUARE "SQUARE"
 #endif
 
+#ifdef BUTTON_ICONS
 const char *PlayStationButtons[][MAX_CONTROLLERACTIONS] =
-{
-	{
-		PS2_CIRCLE,    // PED_FIREWEAPON
-		"R2",   // PED_CYCLE_WEAPON_RIGHT
-		"L2",   // PED_CYCLE_WEAPON_LEFT
-		nil,    // GO_FORWARD
-		nil,    // GO_BACK
-		nil,    // GO_LEFT
-		nil,    // GO_RIGHT
-		PS2_SQUARE,    // PED_SNIPER_ZOOM_IN
-		PS2_CROSS,    // PED_SNIPER_ZOOM_OUT
-		PS2_TRIANGLE,    // VEHICLE_ENTER_EXIT
-		"SELECT", // CAMERA_CHANGE_VIEW_ALL_SITUATIONS
-		PS2_SQUARE,    // PED_JUMPING
-		PS2_CROSS,    // PED_SPRINT
-		"R3",   // PED_LOOKBEHIND
-#ifdef BIND_VEHICLE_FIREWEAPON
-		PS2_CIRCLE,   // VEHICLE_FIREWEAPON
+    CONTROLLER_BUTTONS(PS2_TRIANGLE, PS2_CIRCLE, PS2_CROSS, PS2_SQUARE, "~K~", "~M~", "~A~", "~J~", "~V~", "~C~", "SELECT");
+#else
+const char *PlayStationButtons[][MAX_CONTROLLERACTIONS] =
+    CONTROLLER_BUTTONS(PS2_TRIANGLE, PS2_CIRCLE, PS2_CROSS, PS2_SQUARE, "L1", "L2", "L3", "R1", "R2", "R3", "SELECT");
 #endif
-		PS2_CROSS,  // VEHICLE_ACCELERATE
-		PS2_SQUARE,  // VEHICLE_BRAKE
-		"L1", // VEHICLE_CHANGE_RADIO_STATION
-		"L3", // VEHICLE_HORN
-		"R3", // TOGGLE_SUBMISSIONS
-		"R1", // VEHICLE_HANDBRAKE
-		nil,  // PED_1RST_PERSON_LOOK_LEFT
-		nil,  // PED_1RST_PERSON_LOOK_RIGHT
-		"L2", // VEHICLE_LOOKLEFT
-		"R2", // VEHICLE_LOOKRIGHT
-		nil,  // VEHICLE_LOOKBEHIND
-		nil,  // VEHICLE_TURRETLEFT
-		nil,  // VEHICLE_TURRETRIGHT
-		nil,  // VEHICLE_TURRETUP
-		nil,  // VEHICLE_TURRETDOWN
-		"L2", // PED_CYCLE_TARGET_LEFT
-		"R2", // PED_CYCLE_TARGET_RIGHT
-		"L1", // PED_CENTER_CAMERA_BEHIND_PLAYER
-		"R1", // PED_LOCK_TARGET
-		nil,  // NETWORK_TALK
-		nil,  // PED_1RST_PERSON_LOOK_UP
-		nil,  // PED_1RST_PERSON_LOOK_DOWN
-		nil,  // _CONTROLLERACTION_36
-		nil,  // TOGGLE_DPAD
-		nil,  // SWITCH_DEBUG_CAM_ON
-		nil,  // TAKE_SCREEN_SHOT
-		nil,  // SHOW_MOUSE_POINTER_TOGGLE
-	},
-	{
-		PS2_CIRCLE,    // PED_FIREWEAPON
-		"R2",   // PED_CYCLE_WEAPON_RIGHT
-		"L2",   // PED_CYCLE_WEAPON_LEFT
-		nil,    // GO_FORWARD
-		nil,    // GO_BACK
-		nil,    // GO_LEFT
-		nil,    // GO_RIGHT
-		PS2_SQUARE,    // PED_SNIPER_ZOOM_IN
-		PS2_CROSS,    // PED_SNIPER_ZOOM_OUT
-		PS2_TRIANGLE,    // VEHICLE_ENTER_EXIT
-		"SELECT", // CAMERA_CHANGE_VIEW_ALL_SITUATIONS
-		PS2_SQUARE,    // PED_JUMPING
-		PS2_CROSS,    // PED_SPRINT
-		"R3",   // PED_LOOKBEHIND
-#ifdef BIND_VEHICLE_FIREWEAPON
-		PS2_CIRCLE, // VEHICLE_FIREWEAPON
-#endif
-		PS2_CROSS,    // VEHICLE_ACCELERATE
-		PS2_SQUARE,    // VEHICLE_BRAKE
-		"BACK", // VEHICLE_CHANGE_RADIO_STATION
-		"L1",   // VEHICLE_HORN
-		"R3",   // TOGGLE_SUBMISSIONS
-		"R1",   // VEHICLE_HANDBRAKE
-		nil,    // PED_1RST_PERSON_LOOK_LEFT
-		nil,    // PED_1RST_PERSON_LOOK_RIGHT
-		"L2",   // VEHICLE_LOOKLEFT
-		"R2",   // VEHICLE_LOOKRIGHT
-		nil,    // VEHICLE_LOOKBEHIND
-		nil,    // VEHICLE_TURRETLEFT
-		nil,    // VEHICLE_TURRETRIGHT
-		nil,    // VEHICLE_TURRETUP
-		nil,    // VEHICLE_TURRETDOWN
-		"L2",   // PED_CYCLE_TARGET_LEFT
-		"R2",   // PED_CYCLE_TARGET_RIGHT
-		"L1",   // PED_CENTER_CAMERA_BEHIND_PLAYER
-		"R1",   // PED_LOCK_TARGET
-		nil,    // NETWORK_TALK
-		nil,    // PED_1RST_PERSON_LOOK_UP
-		nil,    // PED_1RST_PERSON_LOOK_DOWN
-		nil,    // _CONTROLLERACTION_36
-		nil,    // TOGGLE_DPAD
-		nil,    // SWITCH_DEBUG_CAM_ON
-		nil,    // TAKE_SCREEN_SHOT
-		nil,    // SHOW_MOUSE_POINTER_TOGGLE
-	},
-	{
-		PS2_CROSS,    // PED_FIREWEAPON
-		"R2",   // PED_CYCLE_WEAPON_RIGHT
-		"L2",   // PED_CYCLE_WEAPON_LEFT
-		nil,    // GO_FORWARD
-		nil,    // GO_BACK
-		nil,    // GO_LEFT
-		nil,    // GO_RIGHT
-		PS2_TRIANGLE,    // PED_SNIPER_ZOOM_IN
-		PS2_SQUARE,    // PED_SNIPER_ZOOM_OUT
-		"L1",   // VEHICLE_ENTER_EXIT
-		"BACK", // CAMERA_CHANGE_VIEW_ALL_SITUATIONS
-		PS2_SQUARE,    // PED_JUMPING
-		PS2_CIRCLE,    // PED_SPRINT
-		"R3",   // PED_LOOKBEHIND
-#ifdef BIND_VEHICLE_FIREWEAPON
-		PS2_CIRCLE,   // VEHICLE_FIREWEAPON
-#endif
-		PS2_CROSS,  // VEHICLE_ACCELERATE
-		PS2_SQUARE,  // VEHICLE_BRAKE
-		"L3", // VEHICLE_CHANGE_RADIO_STATION
-		"R1", // VEHICLE_HORN
-		"R3", // TOGGLE_SUBMISSIONS
-		PS2_TRIANGLE,  // VEHICLE_HANDBRAKE
-		nil,  // PED_1RST_PERSON_LOOK_LEFT
-		nil,  // PED_1RST_PERSON_LOOK_RIGHT
-		"L2", // VEHICLE_LOOKLEFT
-		"R2", // VEHICLE_LOOKRIGHT
-		nil,  // VEHICLE_LOOKBEHIND
-		nil,  // VEHICLE_TURRETLEFT
-		nil,  // VEHICLE_TURRETRIGHT
-		nil,  // VEHICLE_TURRETUP
-		nil,  // VEHICLE_TURRETDOWN
-		"L2", // PED_CYCLE_TARGET_LEFT
-		"R2", // PED_CYCLE_TARGET_RIGHT
-		PS2_TRIANGLE,  // PED_CENTER_CAMERA_BEHIND_PLAYER
-		"R1", // PED_LOCK_TARGET
-		nil,  // NETWORK_TALK
-		nil,  // PED_1RST_PERSON_LOOK_UP
-		nil,  // PED_1RST_PERSON_LOOK_DOWN
-		nil,  // _CONTROLLERACTION_36
-		nil,  // TOGGLE_DPAD
-		nil,  // SWITCH_DEBUG_CAM_ON
-		nil,  // TAKE_SCREEN_SHOT
-		nil,  // SHOW_MOUSE_POINTER_TOGGLE
-	},
-	{
-		"R1",   // PED_FIREWEAPON
-		"R2",   // PED_CYCLE_WEAPON_RIGHT
-		"L2",   // PED_CYCLE_WEAPON_LEFT
-		nil,    // GO_FORWARD
-		nil,    // GO_BACK
-		nil,    // GO_LEFT
-		nil,    // GO_RIGHT
-		PS2_SQUARE,    // PED_SNIPER_ZOOM_IN
-		PS2_CROSS,    // PED_SNIPER_ZOOM_OUT
-		PS2_TRIANGLE,    // VEHICLE_ENTER_EXIT
-		"SELECT", // CAMERA_CHANGE_VIEW_ALL_SITUATIONS
-		PS2_SQUARE,    // PED_JUMPING
-		PS2_CROSS,    // PED_SPRINT
-		"R3",   // PED_LOOKBEHIND
-#ifdef BIND_VEHICLE_FIREWEAPON
-		"R1",   // VEHICLE_FIREWEAPON
-#endif
-		nil,  // VEHICLE_ACCELERATE
-		nil,  // VEHICLE_BRAKE
-		PS2_CIRCLE,  // VEHICLE_CHANGE_RADIO_STATION
-		"L3", // VEHICLE_HORN
-		PS2_SQUARE,  // TOGGLE_SUBMISSIONS
-		"L1", // VEHICLE_HANDBRAKE
-		nil,  // PED_1RST_PERSON_LOOK_LEFT
-		nil,  // PED_1RST_PERSON_LOOK_RIGHT
-		"L2", // VEHICLE_LOOKLEFT
-		"R2", // VEHICLE_LOOKRIGHT
-		nil,  // VEHICLE_LOOKBEHIND
-		nil,  // VEHICLE_TURRETLEFT
-		nil,  // VEHICLE_TURRETRIGHT
-		nil,  // VEHICLE_TURRETUP
-		nil,  // VEHICLE_TURRETDOWN
-		"L2", // PED_CYCLE_TARGET_LEFT
-		"R2", // PED_CYCLE_TARGET_RIGHT
-		PS2_CIRCLE,  // PED_CENTER_CAMERA_BEHIND_PLAYER
-		"L1", // PED_LOCK_TARGET
-		nil,  // NETWORK_TALK
-		nil,  // PED_1RST_PERSON_LOOK_UP
-		nil,  // PED_1RST_PERSON_LOOK_DOWN
-		nil,  // _CONTROLLERACTION_36
-		nil,  // TOGGLE_DPAD
-		nil,  // SWITCH_DEBUG_CAM_ON
-		nil,  // TAKE_SCREEN_SHOT
-		nil,  // SHOW_MOUSE_POINTER_TOGGLE
-	}
-};
 
 #undef PS2_TRIANGLE
 #undef PS2_CIRCLE
 #undef PS2_CROSS
 #undef PS2_SQUARE
 
+#undef CONTROLLER_BUTTONS
+#undef VFB
+
 void CControllerConfigManager::GetWideStringOfCommandKeys(uint16 action, wchar *text, uint16 leight)
 {
 #ifdef DETECT_PAD_INPUT_SWITCH
diff --git a/src/core/config.h b/src/core/config.h
index 9af75405..bdc5cd54 100644
--- a/src/core/config.h
+++ b/src/core/config.h
@@ -258,6 +258,7 @@ enum Config {
 #define ALT_DODO_CHEAT
 #define REGISTER_START_BUTTON
 //#define BIND_VEHICLE_FIREWEAPON // Adds ability to rebind fire key for 'in vehicle' controls
+#define BUTTON_ICONS // use textures to show controller buttons
 
 // Hud, frontend and radar
 #define HUD_ENHANCEMENTS	// Adjusts some aspects to make the HUD look/behave a little bit better.
diff --git a/src/render/Font.cpp b/src/render/Font.cpp
index d0b554dd..6aceaf4b 100644
--- a/src/render/Font.cpp
+++ b/src/render/Font.cpp
@@ -224,6 +224,11 @@ wchar foreign_table[128] = {
 	  0, 174, 165, 166, 167,   0, 168,   0,   0, 169, 170, 171, 172,   0,   0,   0,
 };
 
+#ifdef BUTTON_ICONS
+CSprite2d CFont::ButtonSprite[MAX_BUTTON_ICONS];
+int CFont::PS2Symbol = BUTTON_NONE;
+#endif // BUTTON_ICONS
+
 void
 CFont::Initialise(void)
 {
@@ -281,6 +286,31 @@ CFont::Initialise(void)
 	SetAlphaFade(255.0f);
 	SetDropShadowPosition(0);
 	CTxdStore::PopCurrentTxd();
+
+#ifdef BUTTON_ICONS
+	slot = CTxdStore::AddTxdSlot("buttons");
+	CTxdStore::LoadTxd(slot, "MODELS/X360BTNS.TXD");
+	CTxdStore::AddRef(slot);
+	CTxdStore::PushCurrentTxd();
+	CTxdStore::SetCurrentTxd(slot);
+#if 0  // unused
+	ButtonSprite[BUTTON_UP].SetTexture("up");
+	ButtonSprite[BUTTON_DOWN].SetTexture("down");
+	ButtonSprite[BUTTON_LEFT].SetTexture("left");
+	ButtonSprite[BUTTON_RIGHT].SetTexture("right");
+#endif
+	ButtonSprite[BUTTON_CROSS].SetTexture("cross");
+	ButtonSprite[BUTTON_CIRCLE].SetTexture("circle");
+	ButtonSprite[BUTTON_SQUARE].SetTexture("square");
+	ButtonSprite[BUTTON_TRIANGLE].SetTexture("triangle");
+	ButtonSprite[BUTTON_L1].SetTexture("l1");
+	ButtonSprite[BUTTON_L2].SetTexture("l2");
+	ButtonSprite[BUTTON_L3].SetTexture("l3");
+	ButtonSprite[BUTTON_R1].SetTexture("r1");
+	ButtonSprite[BUTTON_R2].SetTexture("r2");
+	ButtonSprite[BUTTON_R3].SetTexture("r3");
+	CTxdStore::PopCurrentTxd();
+#endif // BUTTON_ICONS
 }
 
 #ifdef MORE_LANGUAGES
@@ -329,6 +359,11 @@ CFont::ReloadFonts(uint8 set)
 void
 CFont::Shutdown(void)
 {
+#ifdef BUTTON_ICONS
+	for (int i = 0; i < MAX_BUTTON_ICONS; i++)
+		ButtonSprite[i].Delete();
+	CTxdStore::RemoveTxdSlot(CTxdStore::FindTxdSlot("buttons"));
+#endif
 	Sprite[0].Delete();
 	Sprite[1].Delete();
 	Sprite[2].Delete();
@@ -354,8 +389,34 @@ CFont::InitPerFrame(void)
 #endif
 	SetDropShadowPosition(0);
 	NewLine = 0;
+#ifdef BUTTON_ICONS
+	PS2Symbol = BUTTON_NONE;
+#endif
 }
 
+#ifdef BUTTON_ICONS
+void
+CFont::DrawButton(float x, float y)
+{
+	if (x <= 0.0f || x > SCREEN_WIDTH || y <= 0.0f || y > SCREEN_HEIGHT)
+		return;
+
+	if (PS2Symbol != BUTTON_NONE) {
+		CRect rect;
+		rect.left = x;
+		rect.top = Details.scaleY + Details.scaleY + y;
+		rect.right = Details.scaleY * 17.0f + x;
+		rect.bottom = Details.scaleY * 19.0f + y;
+
+		int vertexAlphaState;
+		RwRenderStateGet(rwRENDERSTATEVERTEXALPHAENABLE, &vertexAlphaState);
+		RwRenderStateSet(rwRENDERSTATEVERTEXALPHAENABLE, (void *)TRUE);
+		ButtonSprite[PS2Symbol].Draw(rect, CRGBA(255, 255, 255, Details.color.a));
+		RwRenderStateSet(rwRENDERSTATEVERTEXALPHAENABLE, (void *)vertexAlphaState);
+	}
+}
+#endif
+
 void
 CFont::PrintChar(float x, float y, wchar c)
 {
@@ -822,6 +883,15 @@ CFont::PrintString(float x, float y, wchar *start, wchar *&end, float spwidth, f
 		c = *s - ' ';
 		if (Details.slant != 0.0f && !IsJapanese())
 			y = (Details.slantRefX - x) * Details.slant + Details.slantRefY;
+
+#ifdef BUTTON_ICONS
+		if (PS2Symbol != BUTTON_NONE) {
+			DrawButton(x, y);
+			x += Details.scaleY * 17.0f;
+			PS2Symbol = BUTTON_NONE;
+		}
+#endif
+
 		PrintChar(x, y, c);
 		x += GetCharacterSize(c);
 		if (c == 0 && (!NewLine || !IsJapanese()))	// space
@@ -953,6 +1023,30 @@ CFont::GetStringWidth(wchar *s, bool spaces)
 				do {
 					while (*s == '~' || *s == JAP_TERMINATION) {
 						s++;
+#ifdef BUTTON_ICONS
+						switch (*s) {
+#if 0 // unused
+						case 'U':
+						case 'D':
+						case '<':
+						case '>':
+#endif
+						case 'X':
+						case 'O':
+						case 'Q':
+						case 'T':
+						case 'K':
+						case 'M':
+						case 'A':
+						case 'J':
+						case 'V':
+						case 'C':
+							w += 17.0f * Details.scaleY;
+							break;
+						default:
+							break;
+						}
+#endif
 						while (!(*s == '~' || *s == JAP_TERMINATION)) s++;
 						s++;
 					}
@@ -967,12 +1061,40 @@ CFont::GetStringWidth(wchar *s, bool spaces)
 		for (; (*s != ' ' || spaces) && *s != '\0'; s++) {
 			if (*s == '~') {
 				s++;
+#ifdef BUTTON_ICONS
+				switch (*s) {
+#if 0 // unused
+				case 'U':
+				case 'D':
+				case '<':
+				case '>':
+#endif
+				case 'X':
+				case 'O':
+				case 'Q':
+				case 'T':
+				case 'K':
+				case 'M':
+				case 'A':
+				case 'J':
+				case 'V':
+				case 'C':
+					w += 17.0f * Details.scaleY;
+					break;
+				default:
+					break;
+				}
+#endif
 				while (*s != '~') s++;
+#ifndef FIX_BUGS
 				s++;
 				if (*s == ' ' && !spaces)
 					break;
-			}
-			w += GetCharacterSize(*s - ' ');
+			} 
+#else
+			} else
+#endif
+				w += GetCharacterSize(*s - ' ');
 		}
 	}
 	return w;
@@ -1026,9 +1148,11 @@ CFont::GetNextSpace(wchar *s)
 			if(*s == '~'){
 				s++;
 				while(*s != '~') s++;
+#ifndef FIX_BUGS
 				s++;
 				if(*s == ' ')
 					break;
+#endif
 			}
 	}
 	return s;
@@ -1036,7 +1160,7 @@ CFont::GetNextSpace(wchar *s)
 
 #ifdef MORE_LANGUAGES
 wchar*
-CFont::ParseToken(wchar *s, wchar*, bool japShit)
+CFont::ParseToken(wchar *s, wchar* ss, bool japShit)
 {
 	s++;
 	if ((Details.color.r || Details.color.g || Details.color.b) && !japShit) {
@@ -1056,13 +1180,37 @@ CFont::ParseToken(wchar *s, wchar*, bool japShit)
 		case 'r': SetColor(CRGBA(113, 43, 73, 255)); break;
 		case 'w': SetColor(CRGBA(175, 175, 175, 255)); break;
 		case 'y': SetColor(CRGBA(210, 196, 106, 255)); break;
+#ifdef BUTTON_ICONS
+#if 0 // unused
+		case 'U': PS2Symbol = BUTTON_UP; break;
+		case 'D': PS2Symbol = BUTTON_DOWN; break;
+		case '<': PS2Symbol = BUTTON_LEFT; break;
+		case '>': PS2Symbol = BUTTON_RIGHT; break;
+#endif
+		case 'X': PS2Symbol = BUTTON_CROSS; break;
+		case 'O': PS2Symbol = BUTTON_CIRCLE; break;
+		case 'Q': PS2Symbol = BUTTON_SQUARE; break;
+		case 'T': PS2Symbol = BUTTON_TRIANGLE; break;
+		case 'K': PS2Symbol = BUTTON_L1; break;
+		case 'M': PS2Symbol = BUTTON_L2; break;
+		case 'A': PS2Symbol = BUTTON_L3; break;
+		case 'J': PS2Symbol = BUTTON_R1; break;
+		case 'V': PS2Symbol = BUTTON_R2; break;
+		case 'C': PS2Symbol = BUTTON_R3; break;
+#endif
 		}
 	} else if (IsJapanese()) {
 		if ((*s & 0x7FFF) == 'N' || (*s & 0x7FFF) == 'n')
 			NewLine = true;
 	}
 	while ((!IsJapanese() || (*s != JAP_TERMINATION)) && *s != '~') s++;
+#ifdef FIX_BUGS
+	if (*(++s) == '~')
+		s = ParseToken(s, ss, japShit);
+	return s;
+#else
 	return s + 1;
+#endif
 }
 #else
 wchar*
@@ -1083,6 +1231,24 @@ CFont::ParseToken(wchar *s, wchar*)
 		case 'r': SetColor(CRGBA(0x71, 0x2B, 0x49, 0xFF)); break;
 		case 'w': SetColor(CRGBA(0xAF, 0xAF, 0xAF, 0xFF)); break;
 		case 'y': SetColor(CRGBA(0xD2, 0xC4, 0x6A, 0xFF)); break;
+#ifdef BUTTON_ICONS
+#if 0 // unused
+		case 'U': PS2Symbol = BUTTON_UP; break;
+		case 'D': PS2Symbol = BUTTON_DOWN; break;
+		case '<': PS2Symbol = BUTTON_LEFT; break;
+		case '>': PS2Symbol = BUTTON_RIGHT; break;
+#endif
+		case 'X': PS2Symbol = BUTTON_CROSS; break;
+		case 'O': PS2Symbol = BUTTON_CIRCLE; break;
+		case 'Q': PS2Symbol = BUTTON_SQUARE; break;
+		case 'T': PS2Symbol = BUTTON_TRIANGLE; break;
+		case 'K': PS2Symbol = BUTTON_L1; break;
+		case 'M': PS2Symbol = BUTTON_L2; break;
+		case 'A': PS2Symbol = BUTTON_L3; break;
+		case 'J': PS2Symbol = BUTTON_R1; break;
+		case 'V': PS2Symbol = BUTTON_R2; break;
+		case 'C': PS2Symbol = BUTTON_R3; break;
+#endif
 		}
 	while(*s != '~') s++;
 	return s+1;
diff --git a/src/render/Font.h b/src/render/Font.h
index 51035601..be1eabed 100644
--- a/src/render/Font.h
+++ b/src/render/Font.h
@@ -63,6 +63,31 @@ enum
 #define FONT_LOCALE(style) (style)
 #endif
 
+#ifdef BUTTON_ICONS
+enum
+{
+	BUTTON_NONE = -1,
+#if 0 // unused
+	BUTTON_UP,
+	BUTTON_DOWN,
+	BUTTON_LEFT,
+	BUTTON_RIGHT,
+#endif
+	BUTTON_CROSS,
+	BUTTON_CIRCLE,
+	BUTTON_SQUARE,
+	BUTTON_TRIANGLE,
+	BUTTON_L1,
+	BUTTON_L2,
+	BUTTON_L3,
+	BUTTON_R1,
+	BUTTON_R2,
+	BUTTON_R3,
+	MAX_BUTTON_ICONS
+};
+#endif // BUTTON_ICONS
+
+
 class CFont
 {
 #ifdef MORE_LANGUAGES
@@ -77,6 +102,14 @@ public:
 	static CSprite2d Sprite[MAX_FONTS];
 	static CFontDetails Details;
 
+#ifdef BUTTON_ICONS
+	static CSprite2d ButtonSprite[MAX_BUTTON_ICONS];
+	static int PS2Symbol;
+
+	static void DrawButton(float x, float y);
+#endif // BUTTON_ICONS
+
+
 	static void Initialise(void);
 	static void Shutdown(void);
 	static void InitPerFrame(void);