diff --git a/menu/drivers/materialui.c b/menu/drivers/materialui.c
index d8b25246ea..c35e70c88e 100644
--- a/menu/drivers/materialui.c
+++ b/menu/drivers/materialui.c
@@ -1085,8 +1085,8 @@ static void mui_context_bg_destroy(mui_handle_t *mui)
    if (!mui)
       return;
 
-   menu_display_texture_unload((uintptr_t*)&mui->textures.bg.id);
-   menu_display_texture_unload((uintptr_t*)&mui->textures.white);
+   video_driver_texture_unload((uintptr_t*)&mui->textures.bg.id);
+   video_driver_texture_unload((uintptr_t*)&mui->textures.white);
 }
 
 static void mui_context_destroy(void *data)
@@ -1098,7 +1098,7 @@ static void mui_context_destroy(void *data)
       return;
 
    for (i = 0; i < MUI_TEXTURE_LAST; i++)
-      menu_display_texture_unload((uintptr_t*)&mui->textures.list[i].id);
+      video_driver_texture_unload((uintptr_t*)&mui->textures.list[i].id);
 
    menu_display_ctl(MENU_DISPLAY_CTL_FONT_MAIN_DEINIT, NULL);
 
diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c
index c33a273dc9..77a3ab47aa 100644
--- a/menu/drivers/xmb.c
+++ b/menu/drivers/xmb.c
@@ -1007,14 +1007,11 @@ static void xmb_context_destroy_horizontal_list(xmb_handle_t *xmb)
       file_list_get_at_offset(xmb->horizontal_list, i,
             &path, NULL, NULL, NULL);
       
-      if (!path)
+      if (!path || !strstr(path, ".lpl"))
          continue;
 
-      if (!strstr(path, ".lpl"))
-         continue;
-
-      menu_display_texture_unload((uintptr_t*)&node->icon);
-      menu_display_texture_unload((uintptr_t*)&node->content_icon);
+      video_driver_texture_unload((uintptr_t*)&node->icon);
+      video_driver_texture_unload((uintptr_t*)&node->content_icon);
    }
 }
 
@@ -2080,8 +2077,7 @@ static void xmb_context_bg_destroy(xmb_handle_t *xmb)
 {
    if (!xmb)
       return;
-
-   menu_display_texture_unload((uintptr_t*)&xmb->textures.bg.id);
+   video_driver_texture_unload((uintptr_t*)&xmb->textures.bg.id);
 }
 
 static bool xmb_load_image(void *userdata, void *data, menu_image_type_t type)
@@ -2561,7 +2557,7 @@ static void xmb_context_destroy(void *data)
       return;
 
    for (i = 0; i < XMB_TEXTURE_LAST; i++)
-      menu_display_texture_unload((uintptr_t*)&xmb->textures.list[i].id);
+      video_driver_texture_unload((uintptr_t*)&xmb->textures.list[i].id);
 
    xmb_context_destroy_horizontal_list(xmb);
    xmb_context_bg_destroy(xmb);
diff --git a/menu/drivers/zarch.c b/menu/drivers/zarch.c
index 0422f6195e..34a22a356a 100644
--- a/menu/drivers/zarch.c
+++ b/menu/drivers/zarch.c
@@ -1125,8 +1125,8 @@ static void zarch_context_bg_destroy(void *data)
    zui_t        *zui     = (zui_t*)data;
    if (!zui)
       return;
-   menu_display_texture_unload((uintptr_t*)&zui->textures.bg.id);
-   menu_display_texture_unload((uintptr_t*)&zui->textures.white);
+   video_driver_texture_unload((uintptr_t*)&zui->textures.bg.id);
+   video_driver_texture_unload((uintptr_t*)&zui->textures.white);
 }
 
 static void zarch_context_destroy(void *data)
diff --git a/menu/menu_display.c b/menu/menu_display.c
index efd518eb68..d7aae7be83 100644
--- a/menu/menu_display.c
+++ b/menu/menu_display.c
@@ -519,13 +519,6 @@ unsigned menu_display_texture_load(void *data,
    return id;
 }
 
-void menu_display_texture_unload(uintptr_t *id)
-{
-   if (!id)
-      return;
-   video_driver_texture_unload(id);
-}
-
 void menu_display_draw(float x, float y,
       unsigned width, unsigned height,
       struct gfx_coords *coords,
diff --git a/menu/menu_display.h b/menu/menu_display.h
index f2d6980702..b847decbfa 100644
--- a/menu/menu_display.h
+++ b/menu/menu_display.h
@@ -175,8 +175,6 @@ unsigned menu_display_texture_load(void *data,
 
 void menu_display_clear_color(float r, float g, float b, float a);
 
-void menu_display_texture_unload(uintptr_t *id);
-
 void menu_display_handle_wallpaper_upload(void *task_data,
       void *user_data, const char *err);