diff --git a/menu/cbs/menu_cbs_get_value.c b/menu/cbs/menu_cbs_get_value.c
index c576e2c2cb..9a8c532272 100644
--- a/menu/cbs/menu_cbs_get_value.c
+++ b/menu/cbs/menu_cbs_get_value.c
@@ -798,9 +798,9 @@ static size_t menu_action_setting_disp_set_label_input_desc(
          if (remap_idx < RARCH_FIRST_CUSTOM_BIND)
             return _len;
          else if (remap_idx % 2 == 0)
-            return strlcpy(s + _len, " +", len - _len);
+            return strlcpy(s + _len, "+", len - _len);
          else
-            return strlcpy(s + _len, " -", len - _len);
+            return strlcpy(s + _len, "-", len - _len);
       }
    }
    /* If descriptor was not found, set this instead */
diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c
index 3e0d713514..8da366cdd9 100644
--- a/menu/menu_displaylist.c
+++ b/menu/menu_displaylist.c
@@ -6160,11 +6160,10 @@ static int menu_displaylist_parse_input_description_list(
                sizeof(input_description));
          if (i >= RARCH_FIRST_CUSTOM_BIND)
          {
-            input_description   [  _len] = ' ';
             if ((i % 2) == 0)
-               input_description[++_len] = '+';
+               input_description[  _len] = '+';
             else
-               input_description[++_len] = '-';
+               input_description[  _len] = '-';
             input_description   [++_len] = '\0';
          }
 
diff --git a/menu/menu_setting.c b/menu/menu_setting.c
index 64d8472d49..4fa858387b 100644
--- a/menu/menu_setting.c
+++ b/menu/menu_setting.c
@@ -9544,10 +9544,31 @@ static bool setting_append_list_input_player_options(
                && (i != RARCH_TURBO_ENABLE)
             )
          {
-            if (sys_info->input_desc_btn[user][i])
-               strlcpy(label       + _len,
-                     sys_info->input_desc_btn[user][i],
-                     sizeof(label) - _len);
+            const char *input_desc_btn;
+
+            input_desc_btn = sys_info->input_desc_btn[user][i];
+            if (!string_is_empty(input_desc_btn))
+            {
+               char input_description[NAME_MAX_LENGTH];
+               /* > Up to RARCH_FIRST_CUSTOM_BIND, inputs
+                *   are buttons - description can be used
+                *   directly
+                * > Above RARCH_FIRST_CUSTOM_BIND, inputs
+                *   are analog axes - have to add +/-
+                *   indicators */
+               size_t _len = strlcpy(input_description, input_desc_btn,
+                     sizeof(input_description));
+               if (i >= RARCH_FIRST_CUSTOM_BIND)
+               {
+                  if ((i % 2) == 0)
+                     input_description[  _len] = '+';
+                  else
+                     input_description[  _len] = '-';
+                  input_description   [++_len] = '\0';
+               }
+
+               strlcpy(label, input_description, sizeof(label));
+            }
             else
             {
                snprintf(label, sizeof(label), "%s (%s)",