diff --git a/Makefile b/Makefile
index 0b2013e54f..15cb1d3254 100644
--- a/Makefile
+++ b/Makefile
@@ -17,7 +17,7 @@ ifeq ($(GLOBAL_CONFIG_DIR),)
    GLOBAL_CONFIG_DIR = /etc
 endif
 
-OBJ := 
+OBJ :=
 LIBS :=
 DEFINES := -DHAVE_CONFIG_H -DRARCH_INTERNAL -DHAVE_OVERLAY
 DEFINES += -DGLOBAL_CONFIG_DIR='"$(GLOBAL_CONFIG_DIR)"'
@@ -185,7 +185,7 @@ install: $(TARGET)
 	mkdir -p $(DESTDIR)$(PREFIX)/share/applications 2>/dev/null || /bin/true
 	mkdir -p $(DESTDIR)$(MAN_DIR)/man6 2>/dev/null || /bin/true
 	mkdir -p $(DESTDIR)$(PREFIX)/share/pixmaps 2>/dev/null || /bin/true
-	install -m755 $(TARGET) $(DESTDIR)$(BIN_DIR) 
+	install -m755 $(TARGET) $(DESTDIR)$(BIN_DIR)
 	install -m755 tools/cg2glsl.py $(DESTDIR)$(BIN_DIR)/retroarch-cg2glsl
 	install -m644 retroarch.cfg $(DESTDIR)$(GLOBAL_CONFIG_DIR)/retroarch.cfg
 	install -m644 retroarch.desktop $(DESTDIR)$(PREFIX)/share/applications
@@ -204,6 +204,7 @@ install: $(TARGET)
 		rm -rf $(DESTDIR)$(ASSETS_DIR)/retroarch/assets/xmb/retroactive/src; \
 		rm -rf $(DESTDIR)$(ASSETS_DIR)/retroarch/assets/xmb/neoactive/src; \
 		rm -rf $(DESTDIR)$(ASSETS_DIR)/retroarch/assets/xmb/retroactive_marked/src; \
+		rm -rf $(DESTDIR)$(ASSETS_DIR)/retroarch/assets/xmb/dot-art/src; \
 		echo "Asset copying done."; \
 	fi
 
diff --git a/dist-scripts/dist-cores.sh b/dist-scripts/dist-cores.sh
index 316c4b2e38..2f9ffcb783 100755
--- a/dist-scripts/dist-cores.sh
+++ b/dist-scripts/dist-cores.sh
@@ -144,6 +144,7 @@ if [ $SALAMANDER = "yes" ]; then
          rm -rf ../pkg/${platform}/retroarch.vpk/vpk/assets/xmb/monochrome/src
          rm -rf ../pkg/${platform}/retroarch.vpk/vpk/assets/xmb/retroactive/src
          rm -rf ../pkg/${platform}/retroarch.vpk/vpk/assets/xmb/retroactive_marked/src
+         rm -rf ../pkg/${platform}/retroarch.vpk/vpk/assets/xmb/dot-art/src
       fi
       if [ -d ../media/libretrodb/rdb ]; then
          mkdir -p ../pkg/${platform}/retroarch.vpk/vpk/database/rdb
diff --git a/intl/msg_hash_chs.h b/intl/msg_hash_chs.h
index d65b7ec773..a8cce38124 100644
--- a/intl/msg_hash_chs.h
+++ b/intl/msg_hash_chs.h
@@ -1674,6 +1674,8 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_PIXEL,
       "Pixel")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_RETROACTIVE,
       "RetroActive")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_DOTART,
+      "Dot-Art")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME,
       "菜单颜色主题")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_APPLE_GREEN,
diff --git a/intl/msg_hash_eo.h b/intl/msg_hash_eo.h
index ff3e331b20..1b95b9c0be 100644
--- a/intl/msg_hash_eo.h
+++ b/intl/msg_hash_eo.h
@@ -1568,6 +1568,8 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_PIXEL,
       "Pixel")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_RETROACTIVE,
       "RetroActive")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_DOTART,
+      "Dot-Art")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME,
       "Menu Color Theme")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_APPLE_GREEN,
diff --git a/intl/msg_hash_fr.h b/intl/msg_hash_fr.h
index 041300e24b..1b0c7ccccf 100644
--- a/intl/msg_hash_fr.h
+++ b/intl/msg_hash_fr.h
@@ -1536,6 +1536,8 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_PIXEL,
       "Pixel")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_RETROACTIVE,
       "RetroActive")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_DOTART,
+      "Dot-Art")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME,
       "Dégradé de fond d'écran")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_APPLE_GREEN,
diff --git a/intl/msg_hash_it.h b/intl/msg_hash_it.h
index 4de397e69d..b04ff78c72 100644
--- a/intl/msg_hash_it.h
+++ b/intl/msg_hash_it.h
@@ -1548,6 +1548,8 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_PIXEL,
       "Pixel")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_RETROACTIVE,
       "RetroActive")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_DOTART,
+      "Dot-Art")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME,
       "Colore tema del menù")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_APPLE_GREEN,
diff --git a/intl/msg_hash_ja.h b/intl/msg_hash_ja.h
index db6504a4b2..5eb2544ad9 100644
--- a/intl/msg_hash_ja.h
+++ b/intl/msg_hash_ja.h
@@ -1671,6 +1671,8 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_PIXEL,
       "ピクセル")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_RETROACTIVE,
       "レトロアクティブ")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_DOTART,
+      "ドットアート")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME,
       "メニューの色テーマ")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_APPLE_GREEN,
diff --git a/intl/msg_hash_nl.h b/intl/msg_hash_nl.h
index c7dc1bd2f9..5c972e83b4 100644
--- a/intl/msg_hash_nl.h
+++ b/intl/msg_hash_nl.h
@@ -1568,6 +1568,8 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_PIXEL,
       "Pixel")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_RETROACTIVE,
       "RetroActive")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_DOTART,
+      "Dot-Art")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME,
       "Menu Color Theme")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_APPLE_GREEN,
diff --git a/intl/msg_hash_ru.h b/intl/msg_hash_ru.h
index 92a072f398..1766901a35 100644
--- a/intl/msg_hash_ru.h
+++ b/intl/msg_hash_ru.h
@@ -1,4 +1,4 @@
-#if defined(_MSC_VER) && !defined(_XBOX)
+#if defined(_MSC_VER) && !defined(_XBOX)
 /* https://support.microsoft.com/en-us/kb/980263 */
 #pragma execution_character_set("utf-8")
 #endif
@@ -1569,6 +1569,8 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_PIXEL,
       "Pixel")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_RETROACTIVE,
       "RetroActive")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_DOTART,
+      "Dot-Art")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME,
       "Menu Color Theme")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_APPLE_GREEN,
diff --git a/intl/msg_hash_us.h b/intl/msg_hash_us.h
index a24ea3cc2a..cc7801a7f8 100644
--- a/intl/msg_hash_us.h
+++ b/intl/msg_hash_us.h
@@ -1660,6 +1660,8 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_PIXEL,
       "Pixel")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_RETROACTIVE,
       "RetroActive")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_DOTART,
+      "Dot-Art")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME,
       "Menu Color Theme")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_APPLE_GREEN,
diff --git a/intl/msg_hash_vn.c b/intl/msg_hash_vn.c
index d4642c9fb5..74bfb39ce8 100644
--- a/intl/msg_hash_vn.c
+++ b/intl/msg_hash_vn.c
@@ -1,4 +1,4 @@
-/*  RetroArch - A frontend for libretro.
+/*  RetroArch - A frontend for libretro.
  *  Copyright (C) 2011-2017 - Daniel De Matteis
  *  Copyright (C) 2016-2017 - Brad Parker
  *
@@ -3237,6 +3237,8 @@ const char *msg_hash_to_str_vn(enum msg_hash_enums msg)
          return "Pixel";
       case MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_RETROACTIVE:
          return "RetroActive";
+      case MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_DOTART:
+         return "Dot-Art";
       case MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME:
          return "Menu Color Theme";
       case MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_APPLE_GREEN:
diff --git a/menu/cbs/menu_cbs_get_value.c b/menu/cbs/menu_cbs_get_value.c
index 8b19634b7a..26482d35bb 100644
--- a/menu/cbs/menu_cbs_get_value.c
+++ b/menu/cbs/menu_cbs_get_value.c
@@ -737,6 +737,10 @@ static void menu_action_setting_disp_set_label_xmb_theme(
          strlcpy(s,
                msg_hash_to_str(MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_SYSTEMATIC), len);
 	 break;
+      case XMB_ICON_THEME_DOTART:
+         strlcpy(s,
+               msg_hash_to_str(MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_DOTART), len);
+         break;
       case XMB_ICON_THEME_CUSTOM:
          strlcpy(s,
                msg_hash_to_str(MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_CUSTOM), len);
diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c
index b5732684c4..25bdee0e3f 100644
--- a/menu/drivers/xmb.c
+++ b/menu/drivers/xmb.c
@@ -401,6 +401,8 @@ const char* xmb_theme_ident(void)
          return "neoactive";
       case XMB_ICON_THEME_SYSTEMATIC:
          return "systematic";
+      case XMB_ICON_THEME_DOTART:
+         return "dot-art";
       case XMB_ICON_THEME_CUSTOM:
          return "custom";
       case XMB_ICON_THEME_MONOCHROME:
@@ -625,9 +627,9 @@ static void xmb_draw_thumbnail(
    struct video_coords coords;
    math_matrix_4x4 mymat;
    float shadow[16];
-   float y                  = 
+   float y                  =
       xmb->margins.screen.top + xmb->icon.size + h;
-   float x                  = 
+   float x                  =
       xmb->margins.screen.left + xmb->icon.spacing.horizontal +
       xmb->icon.spacing.horizontal*4 - xmb->icon.size / 4;
 
@@ -943,7 +945,7 @@ static void xmb_update_thumbnail_path(void *data, unsigned i)
    fill_pathname_join(xmb->thumbnail_file_path, xmb->thumbnail_file_path,
          xmb_thumbnails_ident(), sizeof(xmb->thumbnail_file_path));
 
-   /* Scrub characters that are not cross-platform and/or violate the 
+   /* Scrub characters that are not cross-platform and/or violate the
     * No-Intro filename standard:
     * http://datomatic.no-intro.org/stuff/The%20Official%20No-Intro%20Convention%20(20071030).zip
     * Replace these characters in the entry name with underscores.
@@ -2225,7 +2227,7 @@ static void xmb_draw_items(
                (!string_is_equal
                 (
                  xmb_thumbnails_ident(),
-                 msg_hash_to_str(MENU_ENUM_LABEL_VALUE_OFF)) 
+                 msg_hash_to_str(MENU_ENUM_LABEL_VALUE_OFF))
                 && xmb->thumbnail)
             )
             ticker_limit = 40;
@@ -2680,7 +2682,7 @@ static void xmb_frame(void *data, video_frame_info_t *video_info)
                   menu_disp_info,
                   xmb->icon.size,
                   &mymat,
-                  xmb->textures.list[charging 
+                  xmb->textures.list[charging
                   ? XMB_TEXTURE_BATTERY_CHARGING : XMB_TEXTURE_BATTERY_FULL],
                   width - (xmb->icon.size / 2) - x_pos_icon,
                   xmb->icon.size,
@@ -2921,7 +2923,7 @@ static void xmb_layout_ps3(xmb_handle_t *xmb, int width)
    unsigned new_font_size, new_header_height;
    settings_t *settings          = config_get_ptr();
 
-   float scale_factor            = 
+   float scale_factor            =
       (settings->menu.xmb.scale_factor * width) / (1920.0 * 100);
 
    xmb->above_subitem_offset     =   1.5;
@@ -2989,7 +2991,7 @@ static void xmb_layout_psp(xmb_handle_t *xmb, int width)
 {
    unsigned new_font_size, new_header_height;
    settings_t *settings          = config_get_ptr();
-   float scale_factor            = 
+   float scale_factor            =
       ((settings->menu.xmb.scale_factor * width) / (1920.0 * 100)) * 1.5;
 
 #ifdef _3DS
diff --git a/menu/menu_display.h b/menu/menu_display.h
index 4ed5f63b6e..d3db194915 100644
--- a/menu/menu_display.h
+++ b/menu/menu_display.h
@@ -67,6 +67,7 @@ enum xmb_icon_theme
    XMB_ICON_THEME_PIXEL,
    XMB_ICON_THEME_NEOACTIVE,
    XMB_ICON_THEME_SYSTEMATIC,
+   XMB_ICON_THEME_DOTART,
    XMB_ICON_THEME_CUSTOM
 };
 
diff --git a/msg_hash.h b/msg_hash.h
index bcad00fa99..77a4163c6d 100644
--- a/msg_hash.h
+++ b/msg_hash.h
@@ -391,6 +391,7 @@ enum msg_hash_enums
    MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_PIXEL,
    MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_NEOACTIVE,
    MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_SYSTEMATIC,
+   MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_DOTART,
    MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_CUSTOM,
 
    MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_LEGACY_RED,
@@ -663,7 +664,7 @@ enum msg_hash_enums
    MENU_LABEL(XMB_SHOW_MUSIC),
    MENU_LABEL(XMB_SHOW_VIDEO),
    MENU_LABEL(XMB_SHOW_HISTORY),
-   MENU_LABEL(XMB_SHOW_ADD),   
+   MENU_LABEL(XMB_SHOW_ADD),
    MENU_LABEL(XMB_RIBBON_ENABLE),
    MENU_LABEL(THUMBNAILS),
    MENU_LABEL(TIMEDATE_ENABLE),