diff --git a/menu/drivers/nuklear/nk_wnd_file_picker.c b/menu/drivers/nuklear/nk_wnd_file_picker.c
index 7235224d70..ca4e58bbf5 100644
--- a/menu/drivers/nuklear/nk_wnd_file_picker.c
+++ b/menu/drivers/nuklear/nk_wnd_file_picker.c
@@ -28,28 +28,62 @@
 
 #include "../../menu_driver.h"
 #include "../../menu_hash.h"
+#include "../../frontend/frontend_driver.h"
 
+static bool assets_loaded;
 
+static file_list_t *drives;
+static file_list_t *files;
 
+struct icon_list {
+    struct nk_image disk;
+    struct nk_image folder;
+    struct nk_image file;
+};
+struct icon_list icons;
 
-void nk_wnd_file_picker(nk_menu_handle_t *zr)
+void load_icons(nk_menu_handle_t *nk)
+{
+   char buf[PATH_MAX_LENGTH];
+   fill_pathname_join(buf, nk->assets_directory,
+         "harddisk.png", sizeof(buf));
+   icons.disk = nk_common_image_load(buf);
+
+   assets_loaded = true;
+}
+
+void nk_wnd_file_picker(nk_menu_handle_t *nk)
 {
    unsigned i;
    video_shader_ctx_t shader_info;
    struct nk_panel layout;
-   struct nk_context *ctx = &zr->ctx;
+   struct nk_context *ctx = &nk->ctx;
    const int id           = NK_WND_FILE_PICKER;
    settings_t *settings   = config_get_ptr();
 
-   if (nk_begin(ctx, &layout, "Select File", nk_rect(240, 10, 300, 400),
-         NK_WINDOW_CLOSABLE|NK_WINDOW_MINIMIZABLE|NK_WINDOW_MOVABLE|
-         NK_WINDOW_SCALABLE|NK_WINDOW_BORDER))
+   if (!drives)
    {
-      nk_layout_row_dynamic(ctx, 30, 1);
+      drives = (file_list_t*)calloc(1, sizeof(file_list_t));
+      frontend_driver_parse_drive_list(drives);
+      /* RARCH_LOG ("Drives: %s\n",drives->list[0].path); */
+   }
+   if (!files)
+      files = (file_list_t*)calloc(1, sizeof(file_list_t));
+
+   if (!assets_loaded)
+      load_icons(nk);
 
-
-   }
+   if (nk_begin(ctx, &layout, "Select File", nk_rect(440, 10, 330, 400),
+         NK_WINDOW_CLOSABLE|NK_WINDOW_MINIMIZABLE|NK_WINDOW_MOVABLE|
+         NK_WINDOW_BORDER))
+   {
+      nk_layout_row_dynamic(ctx, 30, 3);
+      for (int i = 0; i < drives->size; i++ )
+      {
+         nk_button_image_label(ctx, icons.disk, drives->list[i].path, NK_TEXT_CENTERED, NK_BUTTON_DEFAULT);
+      }
+   }
    /* save position and size to restore after context reset */
-   nk_wnd_set_state(zr, id, nk_window_get_position(ctx), nk_window_get_size(ctx));
+   nk_wnd_set_state(nk, id, nk_window_get_position(ctx), nk_window_get_size(ctx));
    nk_end(ctx);
 }
\ No newline at end of file