diff --git a/app/assets/images/pages/play/modal/hero_portrait_picker_active.png b/app/assets/images/pages/play/modal/hero-portrait-selected.png
similarity index 100%
rename from app/assets/images/pages/play/modal/hero_portrait_picker_active.png
rename to app/assets/images/pages/play/modal/hero-portrait-selected.png
diff --git a/app/assets/images/pages/play/modal/hero_portrait_picker_inactive.png b/app/assets/images/pages/play/modal/hero-portrait.png
similarity index 100%
rename from app/assets/images/pages/play/modal/hero_portrait_picker_inactive.png
rename to app/assets/images/pages/play/modal/hero-portrait.png
diff --git a/app/assets/images/pages/play/modal/play-heroes-background.png b/app/assets/images/pages/play/modal/heroes-background.png
similarity index 100%
rename from app/assets/images/pages/play/modal/play-heroes-background.png
rename to app/assets/images/pages/play/modal/heroes-background.png
diff --git a/app/assets/images/pages/play/modal/play-items-modal-selected-item-background.png b/app/assets/images/pages/play/modal/item-box-background-selected.png
similarity index 100%
rename from app/assets/images/pages/play/modal/play-items-modal-selected-item-background.png
rename to app/assets/images/pages/play/modal/item-box-background-selected.png
diff --git a/app/assets/images/pages/play/modal/play-items-modal-item-background.png b/app/assets/images/pages/play/modal/item-box-background.png
similarity index 100%
rename from app/assets/images/pages/play/modal/play-items-modal-item-background.png
rename to app/assets/images/pages/play/modal/item-box-background.png
diff --git a/app/assets/images/pages/play/modal/play-items-modal-hr.png b/app/assets/images/pages/play/modal/item-details-hr.png
similarity index 100%
rename from app/assets/images/pages/play/modal/play-items-modal-hr.png
rename to app/assets/images/pages/play/modal/item-details-hr.png
diff --git a/app/assets/images/pages/play/modal/play-items-modal-tab-icon-accessories.png b/app/assets/images/pages/play/modal/item-icon-accessories.png
similarity index 100%
rename from app/assets/images/pages/play/modal/play-items-modal-tab-icon-accessories.png
rename to app/assets/images/pages/play/modal/item-icon-accessories.png
diff --git a/app/assets/images/pages/play/modal/play-items-modal-tab-icon-armor.png b/app/assets/images/pages/play/modal/item-icon-armor.png
similarity index 100%
rename from app/assets/images/pages/play/modal/play-items-modal-tab-icon-armor.png
rename to app/assets/images/pages/play/modal/item-icon-armor.png
diff --git a/app/assets/images/pages/play/modal/play-items-modal-tab-icon-books.png b/app/assets/images/pages/play/modal/item-icon-books.png
similarity index 100%
rename from app/assets/images/pages/play/modal/play-items-modal-tab-icon-books.png
rename to app/assets/images/pages/play/modal/item-icon-books.png
diff --git a/app/assets/images/pages/play/modal/play-items-modal-tab-icon-misc.png b/app/assets/images/pages/play/modal/item-icon-misc.png
similarity index 100%
rename from app/assets/images/pages/play/modal/play-items-modal-tab-icon-misc.png
rename to app/assets/images/pages/play/modal/item-icon-misc.png
diff --git a/app/assets/images/pages/play/modal/play-items-modal-tab-icon-primary.png b/app/assets/images/pages/play/modal/item-icon-primary.png
similarity index 100%
rename from app/assets/images/pages/play/modal/play-items-modal-tab-icon-primary.png
rename to app/assets/images/pages/play/modal/item-icon-primary.png
diff --git a/app/assets/images/pages/play/modal/play-items-modal-tab-icon-secondary.png b/app/assets/images/pages/play/modal/item-icon-secondary.png
similarity index 100%
rename from app/assets/images/pages/play/modal/play-items-modal-tab-icon-secondary.png
rename to app/assets/images/pages/play/modal/item-icon-secondary.png
diff --git a/app/assets/images/pages/play/modal/play-items-modal-background-narrow.png b/app/assets/images/pages/play/modal/items-background-narrow.png
similarity index 100%
rename from app/assets/images/pages/play/modal/play-items-modal-background-narrow.png
rename to app/assets/images/pages/play/modal/items-background-narrow.png
diff --git a/app/assets/images/pages/play/modal/play-items-modal-background.png b/app/assets/images/pages/play/modal/items-background.png
similarity index 100%
rename from app/assets/images/pages/play/modal/play-items-modal-background.png
rename to app/assets/images/pages/play/modal/items-background.png
diff --git a/app/assets/images/pages/play/modal/play-items-modal-selected-tab.png b/app/assets/images/pages/play/modal/menu-tab-selected.png
similarity index 100%
rename from app/assets/images/pages/play/modal/play-items-modal-selected-tab.png
rename to app/assets/images/pages/play/modal/menu-tab-selected.png
diff --git a/app/assets/images/pages/play/modal/play-items-modal-tab.png b/app/assets/images/pages/play/modal/menu-tab.png
similarity index 100%
rename from app/assets/images/pages/play/modal/play-items-modal-tab.png
rename to app/assets/images/pages/play/modal/menu-tab.png
diff --git a/app/styles/play/modal/play-heroes-modal.sass b/app/styles/play/modal/play-heroes-modal.sass
index 07e4ac87e..f9c669f23 100644
--- a/app/styles/play/modal/play-heroes-modal.sass
+++ b/app/styles/play/modal/play-heroes-modal.sass
@@ -77,10 +77,10 @@ $heroCanvasHeight: 265px
           height: 98px
           margin: 0 -11px
           position: relative
-          background: url(/images/pages/play/modal/hero_portrait_picker_inactive.png)
+          background: url(/images/pages/play/modal/hero-portrait.png)
           border: none
           &.active
-            background: url(/images/pages/play/modal/hero_portrait_picker_active.png)
+            background: url(/images/pages/play/modal/hero-portrait-selected.png)
             z-index: 5
 
           .hero-avatar
diff --git a/app/styles/play/modal/play-items-modal.sass b/app/styles/play/modal/play-items-modal.sass
index 5dd58c300..d75098290 100644
--- a/app/styles/play/modal/play-items-modal.sass
+++ b/app/styles/play/modal/play-items-modal.sass
@@ -86,7 +86,7 @@
     width: 178px
     
     li
-      background: url(/images/pages/play/modal/play-items-modal-tab.png)
+      background: url(/images/pages/play/modal/menu-tab.png)
       padding: 5px
       margin: -5px 0
       height: 80px
@@ -104,7 +104,7 @@
         
       
     li.active
-      background: url(/images/pages/play/modal/play-items-modal-selected-tab.png)
+      background: url(/images/pages/play/modal/menu-tab-selected.png)
       width: 197px
       
       a
@@ -136,7 +136,7 @@
     padding: 10px
     height: 195px
     float: left
-    background: url(/images/pages/play/modal/play-items-modal-item-background.png)
+    background: url(/images/pages/play/modal/item-box-background.png)
     margin: 4px
     text-align: center
     position: relative
@@ -220,7 +220,7 @@
       font-size: 16px
 
     &.selected
-      background: url(/images/pages/play/modal/play-items-modal-selected-item-background.png)
+      background: url(/images/pages/play/modal/item-box-background-selected.png)
 
     
   //- Item list scrollbar
diff --git a/app/templates/play/modal/play-heroes-modal.jade b/app/templates/play/modal/play-heroes-modal.jade
index 68582c2a2..6b8e8dee6 100644
--- a/app/templates/play/modal/play-heroes-modal.jade
+++ b/app/templates/play/modal/play-heroes-modal.jade
@@ -1,7 +1,7 @@
 .modal-dialog
   .modal-content
 
-    img(src="/images/pages/play/modal/play-heroes-background.png")#play-heroes-background
+    img(src="/images/pages/play/modal/heroes-background.png")#play-heroes-background
     
     h1(data-i18n="choose_hero.choose_hero")
 
diff --git a/app/templates/play/modal/play-items-modal.jade b/app/templates/play/modal/play-items-modal.jade
index b9ebed2f0..38e4be7d9 100644
--- a/app/templates/play/modal/play-items-modal.jade
+++ b/app/templates/play/modal/play-items-modal.jade
@@ -1,7 +1,7 @@
 .modal-dialog
   .modal-content
-    img(src="/images/pages/play/modal/play-items-modal-background.png")#play-items-modal-bg
-    img(src="/images/pages/play/modal/play-items-modal-background-narrow.png")#play-items-modal-narrow-bg
+    img(src="/images/pages/play/modal/items-background.png")#play-items-modal-bg
+    img(src="/images/pages/play/modal/items-background-narrow.png")#play-items-modal-narrow-bg
     
     h1.big-font(data-i18n="play.items")
     
@@ -15,7 +15,7 @@
       for category, index in itemCategories
         li(class=index ? "" : "active")
           a.one-line(href="#item-category-" + category, data-toggle="tab")
-            img.tab-icon(src="/images/pages/play/modal/play-items-modal-tab-icon-"+category+".png")
+            img.tab-icon(src="/images/pages/play/modal/item-icon-"+category+".png")
             span.big-font= itemCategoryNames[index]