diff --git a/frontend/menu/rmenu.c b/frontend/menu/rmenu.c
index 7e9e9c65ae..205b3acb45 100644
--- a/frontend/menu/rmenu.c
+++ b/frontend/menu/rmenu.c
@@ -2249,9 +2249,10 @@ static int set_setting_action(void *data, unsigned switchvalue, uint64_t input)
 
 static int select_setting(void *data, void *state)
 {
-   static unsigned first_setting = FIRST_VIDEO_SETTING;
-   static unsigned selected = 0;
-   unsigned max_settings = 0;
+   static uint8_t first_setting = FIRST_VIDEO_SETTING;
+   static uint8_t selected = 0;
+   static uint8_t page_number = 0;
+   uint8_t max_settings = 0;
 
    menu *current_menu = (menu*)data;
    rmenu_state_t *rstate = (rmenu_state_t*)state;
@@ -2295,16 +2296,15 @@ static int select_setting(void *data, void *state)
    }
 
    item *items = (item*)malloc(max_settings * sizeof(*items));
-   unsigned i;
-   char msg[256];
-
 
    rmenu_default_positions_t default_pos;
 
    menu_set_default_pos(&default_pos);
 
-   unsigned j = 0;
-   int page = 0;
+   char msg[256];
+   uint8_t i = 0;
+   uint8_t j = 0;
+   uint8_t item_page = 0;
    for(i = first_setting; i < max_settings; i++)
    {
       populate_setting_item(&items[i], i);
@@ -2312,10 +2312,10 @@ static int select_setting(void *data, void *state)
       if(!(j < default_pos.entries_per_page))
       {
          j = 0;
-         page++;
+         item_page++;
       }
 
-      items[i].page = page;
+      items[i].page = item_page;
       j++;
    }
 
@@ -2385,8 +2385,8 @@ static int select_setting(void *data, void *state)
 
       if (selected >= max_settings)
          selected = first_setting; 
-      if (items[selected].page != current_menu->page)
-         current_menu->page = items[selected].page;
+      if (items[selected].page != page_number)
+         page_number = items[selected].page;
    }
    else if (input & (1ULL << RMENU_DEVICE_NAV_UP))
    {
@@ -2395,8 +2395,8 @@ static int select_setting(void *data, void *state)
       else
          selected--;
 
-      if (items[selected].page != current_menu->page)
-         current_menu->page = items[selected].page;
+      if (items[selected].page != page_number)
+         page_number = items[selected].page;
    }
 
    ret = set_setting_action(current_menu, selected, input);
@@ -2408,7 +2408,7 @@ static int select_setting(void *data, void *state)
 
    for(i = first_setting; i < max_settings; i++)
    {
-      if(items[i].page == current_menu->page)
+      if(items[i].page == page_number)
       {
          default_pos.starting_y_position += default_pos.y_position_increment;
 
diff --git a/frontend/menu/utils/menu_stack.c b/frontend/menu/utils/menu_stack.c
index 1610577ccc..f2a807544f 100644
--- a/frontend/menu/utils/menu_stack.c
+++ b/frontend/menu/utils/menu_stack.c
@@ -55,55 +55,46 @@ static void menu_stack_get_current_ptr(menu *current_menu)
    {
       case INGAME_MENU:
          current_menu->enum_id = menu_id;
-         current_menu->page = 0;
          current_menu->category_id = CATEGORY_INGAME_MENU;
          current_menu->entry = ingame_menu;
          break;
       case INGAME_MENU_RESIZE:
          current_menu->enum_id = INGAME_MENU_RESIZE;
-         current_menu->page = 0;
          current_menu->category_id = CATEGORY_INGAME_MENU;
          current_menu->entry = ingame_menu_resize;
          break;
       case INGAME_MENU_SCREENSHOT:
          current_menu->enum_id = menu_id;
-         current_menu->page = 0;
          current_menu->category_id = CATEGORY_INGAME_MENU;
          current_menu->entry = ingame_menu_screenshot;
          break;
       case FILE_BROWSER_MENU:
          current_menu->enum_id = menu_id;
-         current_menu->page = 0;
          current_menu->category_id = CATEGORY_FILEBROWSER;
          current_menu->entry = select_rom;
          break;
       case LIBRETRO_CHOICE:
          current_menu->enum_id = menu_id;
-         current_menu->page = 0;
          current_menu->category_id = CATEGORY_FILEBROWSER;
          current_menu->entry = select_file;
          break;
       case PRESET_CHOICE:
          current_menu->enum_id = menu_id;
-         current_menu->page = 0;
          current_menu->category_id = CATEGORY_FILEBROWSER;
          current_menu->entry = select_file;
          break;
       case INPUT_PRESET_CHOICE:
          current_menu->enum_id = menu_id;
-         current_menu->page = 0;
          current_menu->category_id = CATEGORY_FILEBROWSER;
          current_menu->entry = select_file;
          break;
       case SHADER_CHOICE:
          current_menu->enum_id = menu_id;
-         current_menu->page = 0;
          current_menu->category_id = CATEGORY_FILEBROWSER;
          current_menu->entry = select_file;
          break;
       case BORDER_CHOICE:
          current_menu->enum_id = menu_id;
-         current_menu->page = 0;
          current_menu->category_id = CATEGORY_FILEBROWSER;
          current_menu->entry = select_file;
          break;
@@ -115,49 +106,41 @@ static void menu_stack_get_current_ptr(menu *current_menu)
 #endif
       case PATH_SYSTEM_DIR_CHOICE:
          current_menu->enum_id = menu_id;
-         current_menu->page = 0;
          current_menu->category_id = CATEGORY_FILEBROWSER;
          current_menu->entry = select_directory;
          break;
       case GENERAL_VIDEO_MENU:
          current_menu->enum_id = GENERAL_VIDEO_MENU;
-         current_menu->page = 0;
          current_menu->category_id = CATEGORY_SETTINGS;
          current_menu->entry = select_setting;
          break;
       case GENERAL_AUDIO_MENU:
          current_menu->enum_id = GENERAL_AUDIO_MENU;
-         current_menu->page = 0;
          current_menu->category_id = CATEGORY_SETTINGS;
          current_menu->entry = select_setting;
          break;
       case EMU_GENERAL_MENU:
          current_menu->enum_id = EMU_GENERAL_MENU;
-         current_menu->page = 0;
          current_menu->category_id = CATEGORY_SETTINGS;
          current_menu->entry = select_setting;
          break;
       case EMU_VIDEO_MENU:
          current_menu->enum_id = EMU_VIDEO_MENU;
-         current_menu->page = 0;
          current_menu->category_id = CATEGORY_SETTINGS;
          current_menu->entry = select_setting;
          break;
       case EMU_AUDIO_MENU:
          current_menu->enum_id = EMU_AUDIO_MENU;
-         current_menu->page = 0;
          current_menu->category_id = CATEGORY_SETTINGS;
          current_menu->entry = select_setting;
          break;
       case PATH_MENU:
          current_menu->enum_id = PATH_MENU;
-         current_menu->page = 0;
          current_menu->category_id = CATEGORY_SETTINGS;
          current_menu->entry = select_setting;
          break;
       case CONTROLS_MENU:
          current_menu->enum_id = CONTROLS_MENU;
-         current_menu->page = 0;
          current_menu->category_id = CATEGORY_SETTINGS;
          current_menu->entry = select_setting;
          break;
diff --git a/frontend/menu/utils/menu_stack.h b/frontend/menu/utils/menu_stack.h
index 74009ac166..61dfe7e70a 100644
--- a/frontend/menu/utils/menu_stack.h
+++ b/frontend/menu/utils/menu_stack.h
@@ -20,7 +20,6 @@
 typedef struct
 {
    unsigned char enum_id;
-   unsigned char page;
    unsigned char category_id;
    int (*entry)(void *data, void *state);
 } menu;
diff --git a/gfx/shader_cg.c b/gfx/shader_cg.c
index a6794c857c..e92859fd06 100644
--- a/gfx/shader_cg.c
+++ b/gfx/shader_cg.c
@@ -831,7 +831,6 @@ static bool load_shader(const char *cgp_path, unsigned i, config_file_t *conf)
 
 static bool load_shader_params(unsigned i, config_file_t *conf)
 {
-   bool ret = true;
    char scale_type[64] = {0};
    char scale_type_x[64] = {0};
    char scale_type_y[64] = {0};