diff --git a/menu/drivers/zr.c b/menu/drivers/zr.c
index 433fd430e5..0c87219a6e 100644
--- a/menu/drivers/zr.c
+++ b/menu/drivers/zr.c
@@ -47,6 +47,7 @@
 #include "../../runloop.h"
 #include "../../verbosity.h"
 #include "../../tasks/tasks_internal.h"
+#include "../../deps/stb/stb_image.h"
 
 #if defined(HAVE_OPENGL) || defined(HAVE_OPENGLES)
 #include "../../gfx/common/gl_common.h"
@@ -79,7 +80,6 @@ struct zr_device
 
 static struct zr_device device;
 static struct zr_font font;
-static char zr_font_path[PATH_MAX_LENGTH];
 
 static struct zr_user_font usrfnt;
 static struct zr_allocator zr_alloc;
@@ -124,6 +124,24 @@ static char* zrmenu_file_load(const char* path, size_t* size)
    return buf;
 }
 
+static struct zr_image zr_icon_load(const char *filename)
+{
+    int x,y,n;
+    GLuint tex;
+    unsigned char *data = stbi_load(filename, &x, &y, &n, 0);
+    if (!data) printf("[SDL]: failed to load image: %s", filename);
+
+    glGenTextures(1, &tex);
+    glBindTexture(GL_TEXTURE_2D, tex);
+    glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_NEAREST);
+    glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR_MIPMAP_NEAREST);
+    glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+    glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, x, y, 0, GL_RGBA, GL_UNSIGNED_BYTE, data);
+    glGenerateMipmap(GL_TEXTURE_2D);
+    stbi_image_free(data);
+    return zr_image_id((int)tex);
+}
 
 static void zr_device_init(struct zr_device *dev)
 {
@@ -589,14 +607,22 @@ static void zrmenu_layout(zrmenu_handle_t *zr)
 
 static void zrmenu_init_device(zrmenu_handle_t *zr)
 {
+   char buf[PATH_MAX_LENGTH];
+   fill_pathname_join(buf, zr->assets_directory,
+         "DroidSans.ttf", sizeof(buf));
+
    zr_alloc.userdata.ptr = NULL;
    zr_alloc.alloc = zrmenu_mem_alloc;
    zr_alloc.free = zrmenu_mem_free;
    zr_buffer_init(&device.cmds, &zr_alloc, 1024);
-   usrfnt = font_bake_and_upload(&device, &font, zr_font_path, 16,
+   usrfnt = font_bake_and_upload(&device, &font, buf, 16,
       zr_font_default_glyph_ranges());
    zr_init(&zr->ctx, &zr_alloc, &usrfnt);
    zr_device_init(&device);
+
+   fill_pathname_join(buf, zr->assets_directory, "folder.png", sizeof(buf));
+   zr->icons.folder = zr_icon_load(buf);
+
    zrmenu_set_style(&zr->ctx, THEME_DARK);
 }
 
@@ -623,10 +649,8 @@ static void *zrmenu_init(void **userdata)
 
    *userdata = zr;
 
-   fill_pathname_join(zr_font_path, settings->assets_directory,
-         "zahnrad", sizeof(zr_font_path));
-   fill_pathname_join(zr_font_path, zr_font_path,
-         "DroidSans.ttf", sizeof(zr_font_path));
+   fill_pathname_join(zr->assets_directory, settings->assets_directory,
+         "zahnrad", sizeof(zr->assets_directory));
    zrmenu_init_device(zr);
 
    zr->window_enabled[ZRMENU_WND_WIZARD] = true;
diff --git a/menu/drivers/zr_common.c b/menu/drivers/zr_common.c
index af713b5bd7..c856c6e861 100644
--- a/menu/drivers/zr_common.c
+++ b/menu/drivers/zr_common.c
@@ -14,6 +14,7 @@
 #include "../menu_driver.h"
 #include "../menu_hash.h"
 
+#include "../../gfx/common/gl_common.h"
 #include "../../core_info.h"
 #include "../../configuration.h"
 
@@ -414,6 +415,7 @@ void zrmenu_wnd_wizard(struct zr_context *ctx, zrmenu_handle_t *zr)
 {
    static int width = 600;
    static int height = 500;
+   char buf[PATH_MAX_LENGTH];
 
    settings_t *settings = config_get_ptr();
    struct zr_panel layout;
@@ -423,7 +425,9 @@ void zrmenu_wnd_wizard(struct zr_context *ctx, zrmenu_handle_t *zr)
          ZR_WINDOW_CLOSABLE|ZR_WINDOW_MINIMIZABLE|ZR_WINDOW_MOVABLE|
          ZR_WINDOW_BORDER))
    {
-
+      zr_layout_row_dynamic(ctx, 50, 2);
+      zr_button_text_image(ctx, zr->icons.folder,
+          "Images", ZR_TEXT_CENTERED, ZR_BUTTON_DEFAULT);
 
    }
 
diff --git a/menu/drivers/zr_common.h b/menu/drivers/zr_common.h
index a0fa2acb6a..a79f50dc31 100644
--- a/menu/drivers/zr_common.h
+++ b/menu/drivers/zr_common.h
@@ -22,9 +22,14 @@ enum zrmenu_theme
    THEME_LIGHT
 };
 
+struct icons {
+    struct zr_image folder;
+};
+
 typedef struct zrmenu_handle
 {
    char box_message[PATH_MAX_LENGTH];
+   char assets_directory[PATH_MAX_LENGTH];
    bool window_enabled[5];
    bool resize;
    unsigned width;
@@ -34,6 +39,9 @@ typedef struct zrmenu_handle
    struct zr_memory_status status;
    enum zrmenu_theme theme;
 
+   struct icons icons;
+
+
    struct
    {
       menu_texture_item bg;