diff --git a/menu/drivers/materialui.c b/menu/drivers/materialui.c
index 8696bd0aa3..0490c47b23 100644
--- a/menu/drivers/materialui.c
+++ b/menu/drivers/materialui.c
@@ -1254,8 +1254,8 @@ static void mui_frame(void *data, video_frame_info_t *video_info)
       &highlighted_entry_color[0]
    );
 
-   menu_display_font_bind_block(mui->font, &mui->raster_block);
-   menu_display_font_bind_block(mui->font2, &mui->raster_block2);
+   font_driver_bind_block(mui->font, &mui->raster_block);
+   font_driver_bind_block(mui->font2, &mui->raster_block2);
 
    if (menu_display_get_update_pending())
       mui_render_menu_list(
@@ -1268,8 +1268,12 @@ static void mui_frame(void *data, video_frame_info_t *video_info)
             &active_tab_marker_color[0]
             );
 
-   menu_display_font_flush_block(video_info->width, video_info->height, mui->font);
-   menu_display_font_flush_block(video_info->width, video_info->height, mui->font2);
+   font_driver_flush(video_info->width, video_info->height, mui->font);
+   font_driver_bind_block(mui->font, NULL);
+
+   font_driver_flush(video_info->width, video_info->height, mui->font2);
+   font_driver_bind_block(mui->font2, NULL);
+
    menu_animation_ctl(MENU_ANIMATION_CTL_SET_ACTIVE, NULL);
 
    /* header */
diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c
index f8b9b9c06e..468d92f6b3 100644
--- a/menu/drivers/xmb.c
+++ b/menu/drivers/xmb.c
@@ -2680,8 +2680,8 @@ static void xmb_frame(void *data, video_frame_info_t *video_info)
    title_msg[0]       = '\0';
    title_truncated[0] = '\0';
 
-   menu_display_font_bind_block(xmb->font, &xmb->raster_block);
-   menu_display_font_bind_block(xmb->font2, &xmb->raster_block2);
+   font_driver_bind_block(xmb->font, &xmb->raster_block);
+   font_driver_bind_block(xmb->font2, &xmb->raster_block2);
 
    xmb->raster_block.carr.coords.vertices = 0;
    xmb->raster_block2.carr.coords.vertices = 0;
@@ -2940,8 +2940,11 @@ static void xmb_frame(void *data, video_frame_info_t *video_info)
          width,
          height);
 
-   menu_display_font_flush_block(video_info->width, video_info->height, xmb->font);
-   menu_display_font_flush_block(video_info->width, video_info->height, xmb->font2);
+   font_driver_flush(video_info->width, video_info->height, xmb->font);
+   font_driver_bind_block(xmb->font, NULL);
+
+   font_driver_flush(video_info->width, video_info->height, xmb->font2);
+   font_driver_bind_block(xmb->font2, NULL);
 
    if (xmb->savestate_thumbnail)
       xmb_draw_thumbnail(menu_disp_info,
diff --git a/menu/drivers/zarch.c b/menu/drivers/zarch.c
index 1feb2b2ea1..0958bbaa42 100644
--- a/menu/drivers/zarch.c
+++ b/menu/drivers/zarch.c
@@ -905,7 +905,7 @@ static void zarch_frame(void *data, video_frame_info_t *video_info)
 
    zui->tmp_block.carr.coords.vertices = 0;
 
-   menu_display_font_bind_block((font_data_t*)zui->font, &zui->tmp_block);
+   font_driver_bind_block(zui->font, &zui->tmp_block);
 
    menu_display_push_quad(zui->width, zui->height, zui_bg_screen,
          0, 0, zui->width, zui->height);
@@ -983,8 +983,9 @@ static void zarch_frame(void *data, video_frame_info_t *video_info)
 
    zui->rendering = false;
 
-   menu_display_font_flush_block(video_info->width, video_info->height, 
-         (font_data_t*)zui->font);
+   font_driver_flush(video_info->width, video_inof->height, zui->font);
+   font_driver_bind_block(zui->font, NULL);
+
    menu_display_unset_viewport(video_info->width, video_info->height);
 }
 
diff --git a/menu/menu_driver.c b/menu/menu_driver.c
index 5f735be27e..e3b915e460 100644
--- a/menu/menu_driver.c
+++ b/menu/menu_driver.c
@@ -308,19 +308,6 @@ font_data_t *menu_display_font(enum application_special_type type, float font_si
    return menu_display_font_main_init(&font_info, is_threaded);
 }
 
-void menu_display_font_bind_block(font_data_t *font, void *block)
-{
-   font_driver_bind_block(font, block);
-}
-
-bool menu_display_font_flush_block(unsigned width, unsigned height,
-      font_data_t *font)
-{
-   font_driver_flush(width, height, font);
-   font_driver_bind_block(font, NULL);
-   return true;
-}
-
 void menu_display_coords_array_reset(void)
 {
    menu_disp_ca.coords.vertices = 0;
diff --git a/menu/menu_driver.h b/menu/menu_driver.h
index e7af9214db..61c1af0af8 100644
--- a/menu/menu_driver.h
+++ b/menu/menu_driver.h
@@ -594,8 +594,6 @@ void menu_display_blend_begin(void);
 void menu_display_blend_end(void);
 
 void menu_display_font_free(font_data_t *font);
-void menu_display_font_bind_block(font_data_t *font, void *block);
-bool menu_display_font_flush_block(unsigned width, unsigned height, font_data_t *font);
 
 void menu_display_coords_array_reset(void);
 video_coord_array_t *menu_display_get_coords_array(void);