diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c
index 1c26a40d8a..c0ca234533 100644
--- a/menu/drivers/xmb.c
+++ b/menu/drivers/xmb.c
@@ -67,6 +67,7 @@ enum
    XMB_TEXTURE_SUBSETTING,
    XMB_TEXTURE_ARROW,
    XMB_TEXTURE_RUN,
+   XMB_TEXTURE_CLOSE,
    XMB_TEXTURE_RESUME,
    XMB_TEXTURE_SAVESTATE,
    XMB_TEXTURE_LOADSTATE,
@@ -75,6 +76,7 @@ enum
    XMB_TEXTURE_INPUT_REMAPPING_OPTIONS,
    XMB_TEXTURE_CHEAT_OPTIONS,
    XMB_TEXTURE_DISK_OPTIONS,
+   XMB_TEXTURE_SHADER_OPTIONS,
    XMB_TEXTURE_SCREENSHOT,
    XMB_TEXTURE_RELOAD,
    XMB_TEXTURE_FILE,
@@ -1091,6 +1093,8 @@ static GLuint xmb_icon_get_id(xmb_handle_t *xmb,
          return xmb->textures.list[XMB_TEXTURE_CURSOR].id;
       case MENU_SETTING_ACTION_RUN:
          return xmb->textures.list[XMB_TEXTURE_RUN].id;
+      case MENU_SETTING_ACTION_CLOSE:
+         return xmb->textures.list[XMB_TEXTURE_CLOSE].id;
       case MENU_SETTING_ACTION_SAVESTATE:
          return xmb->textures.list[XMB_TEXTURE_SAVESTATE].id;
       case MENU_SETTING_ACTION_LOADSTATE:
@@ -1105,6 +1109,8 @@ static GLuint xmb_icon_get_id(xmb_handle_t *xmb,
          return xmb->textures.list[XMB_TEXTURE_CHEAT_OPTIONS].id;
       case MENU_SETTING_ACTION_CORE_DISK_OPTIONS:
          return xmb->textures.list[XMB_TEXTURE_DISK_OPTIONS].id;
+      case MENU_SETTING_ACTION_CORE_SHADER_OPTIONS:
+         return xmb->textures.list[XMB_TEXTURE_SHADER_OPTIONS].id;
       case MENU_SETTING_ACTION_SCREENSHOT:
          return xmb->textures.list[XMB_TEXTURE_SCREENSHOT].id;
       case MENU_SETTING_ACTION_RESET:
@@ -1220,6 +1226,9 @@ static void xmb_draw_items(xmb_handle_t *xmb, gl_t *gl,
          case MENU_LABEL_DISK_OPTIONS:
             icon = xmb->textures.list[XMB_TEXTURE_DISK_OPTIONS].id;
             break;
+         case MENU_LABEL_SHADER_OPTIONS:
+            icon = xmb->textures.list[XMB_TEXTURE_SHADER_OPTIONS].id;
+            break;
          case MENU_LABEL_SAVESTATE:
             icon = xmb->textures.list[XMB_TEXTURE_SAVESTATE].id;
             break;
@@ -1971,6 +1980,9 @@ static void xmb_context_reset_textures(xmb_handle_t *xmb, const char *iconpath)
          case XMB_TEXTURE_RUN:
             fill_pathname_join(path, iconpath, "run.png", sizeof(path));
             break;
+         case XMB_TEXTURE_CLOSE:
+            fill_pathname_join(path, iconpath, "close.png", sizeof(path));
+            break;
          case XMB_TEXTURE_RESUME:
             fill_pathname_join(path, iconpath, "resume.png", sizeof(path));
             break;
@@ -2001,6 +2013,9 @@ static void xmb_context_reset_textures(xmb_handle_t *xmb, const char *iconpath)
          case XMB_TEXTURE_DISK_OPTIONS:
             fill_pathname_join(path, iconpath, "core-disk-options.png", sizeof(path));
             break;
+         case XMB_TEXTURE_SHADER_OPTIONS:
+            fill_pathname_join(path, iconpath, "core-shader-options.png", sizeof(path));
+            break;
          case XMB_TEXTURE_SCREENSHOT:
             fill_pathname_join(path, iconpath, "screenshot.png", sizeof(path));
             break;
diff --git a/menu/menu.h b/menu/menu.h
index 4a5c08868b..33c15a8fce 100644
--- a/menu/menu.h
+++ b/menu/menu.h
@@ -95,11 +95,13 @@ typedef enum
    MENU_SETTING_DRIVER,
    MENU_SETTING_ACTION,
    MENU_SETTING_ACTION_RUN,
+   MENU_SETTING_ACTION_CLOSE,
    MENU_SETTING_ACTION_CORE_OPTIONS,
    MENU_SETTING_ACTION_CORE_INPUT_REMAPPING_OPTIONS,
    MENU_SETTING_ACTION_CORE_CHEAT_OPTIONS,
    MENU_SETTING_ACTION_CORE_INFORMATION,
    MENU_SETTING_ACTION_CORE_DISK_OPTIONS,
+   MENU_SETTING_ACTION_CORE_SHADER_OPTIONS,
    MENU_SETTING_ACTION_SAVESTATE,
    MENU_SETTING_ACTION_LOADSTATE,
    MENU_SETTING_ACTION_SCREENSHOT,
diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c
index 339a14a250..1b1276b2a6 100644
--- a/menu/menu_displaylist.c
+++ b/menu/menu_displaylist.c
@@ -1540,7 +1540,7 @@ static int menu_displaylist_parse_load_content_settings(menu_displaylist_info_t
       menu_list_push(info->list,
             menu_hash_to_str(MENU_LABEL_VALUE_CLOSE_CONTENT),
             menu_hash_to_str(MENU_LABEL_CLOSE_CONTENT),
-            MENU_SETTING_ACTION_RUN, 0, 0);
+            MENU_SETTING_ACTION_CLOSE, 0, 0);
 
       menu_list_push(info->list,
             menu_hash_to_str(MENU_LABEL_VALUE_TAKE_SCREENSHOT),