diff --git a/menu/drivers/zr.c b/menu/drivers/zr.c
index 0c87219a6e..0fee4fcec8 100644
--- a/menu/drivers/zr.c
+++ b/menu/drivers/zr.c
@@ -622,6 +622,8 @@ static void zrmenu_init_device(zrmenu_handle_t *zr)
 
    fill_pathname_join(buf, zr->assets_directory, "folder.png", sizeof(buf));
    zr->icons.folder = zr_icon_load(buf);
+   fill_pathname_join(buf, zr->assets_directory, "speaker.png", sizeof(buf));
+   zr->icons.folder = zr_icon_load(buf);
 
    zrmenu_set_style(&zr->ctx, THEME_DARK);
 }
diff --git a/menu/drivers/zr_common.c b/menu/drivers/zr_common.c
index c856c6e861..53f3cc9271 100644
--- a/menu/drivers/zr_common.c
+++ b/menu/drivers/zr_common.c
@@ -1,3 +1,20 @@
+/*  RetroArch - A frontend for libretro.
+ *  Copyright (C) 2011-2016 - Daniel De Matteis
+ *  Copyright (C) 2014-2015 - Jean-André Santoni
+ *  Copyright (C) 2016      - Andrés Suárez
+ *
+ *  RetroArch is free software: you can redistribute it and/or modify it under the terms
+ *  of the GNU General Public License as published by the Free Software Found-
+ *  ation, either version 3 of the License, or (at your option) any later version.
+ *
+ *  RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ *  PURPOSE.  See the GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along with RetroArch.
+ *  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #include "zr_common.h"
 
 #include <stdint.h>
@@ -427,7 +444,10 @@ void zrmenu_wnd_wizard(struct zr_context *ctx, zrmenu_handle_t *zr)
    {
       zr_layout_row_dynamic(ctx, 50, 2);
       zr_button_text_image(ctx, zr->icons.folder,
-          "Images", ZR_TEXT_CENTERED, ZR_BUTTON_DEFAULT);
+          "Test", ZR_TEXT_CENTERED, ZR_BUTTON_DEFAULT);
+
+      zr_button_text_image(ctx, zr->icons.display,
+           "Test", ZR_TEXT_CENTERED, ZR_BUTTON_DEFAULT);
 
    }
 
diff --git a/menu/drivers/zr_common.h b/menu/drivers/zr_common.h
index a79f50dc31..06e29cedf9 100644
--- a/menu/drivers/zr_common.h
+++ b/menu/drivers/zr_common.h
@@ -1,3 +1,20 @@
+/*  RetroArch - A frontend for libretro.
+ *  Copyright (C) 2011-2016 - Daniel De Matteis
+ *  Copyright (C) 2014-2015 - Jean-André Santoni
+ *  Copyright (C) 2016      - Andrés Suárez
+ *
+ *  RetroArch is free software: you can redistribute it and/or modify it under the terms
+ *  of the GNU General Public License as published by the Free Software Found-
+ *  ation, either version 3 of the License, or (at your option) any later version.
+ *
+ *  RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ *  PURPOSE.  See the GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along with RetroArch.
+ *  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #include "../../deps/zahnrad/zahnrad.h"
 #include "../menu_display.h"
 
@@ -24,6 +41,10 @@ enum zrmenu_theme
 
 struct icons {
     struct zr_image folder;
+    struct zr_image monitor;
+    struct zr_image gamepad;
+    struct zr_image settings;
+    struct zr_image speaker;
 };
 
 typedef struct zrmenu_handle