diff --git a/assets/images/bosses/boss_demon.png b/assets/images/bosses/boss_demon/boss_demon_1024x1024.png
similarity index 100%
rename from assets/images/bosses/boss_demon.png
rename to assets/images/bosses/boss_demon/boss_demon_1024x1024.png
diff --git a/assets/images/bosses/boss_demon/boss_demon_preview_256x256.png b/assets/images/bosses/boss_demon/boss_demon_preview_256x256.png
new file mode 100644
index 000000000..6bcf67fe1
Binary files /dev/null and b/assets/images/bosses/boss_demon/boss_demon_preview_256x256.png differ
diff --git a/assets/images/bosses/boss_dragon_fire.png b/assets/images/bosses/boss_dragon_fire/boss_dragon_fire_1024x1024.png
similarity index 100%
rename from assets/images/bosses/boss_dragon_fire.png
rename to assets/images/bosses/boss_dragon_fire/boss_dragon_fire_1024x1024.png
diff --git a/assets/images/bosses/boss_dragon_fire/boss_dragon_fire_preview_256x256.png b/assets/images/bosses/boss_dragon_fire/boss_dragon_fire_preview_256x256.png
new file mode 100644
index 000000000..ca5124828
Binary files /dev/null and b/assets/images/bosses/boss_dragon_fire/boss_dragon_fire_preview_256x256.png differ
diff --git a/assets/images/bosses/boss_dragon_ice.png b/assets/images/bosses/boss_dragon_ice/boss_dragon_ice_1024x1024.png
similarity index 100%
rename from assets/images/bosses/boss_dragon_ice.png
rename to assets/images/bosses/boss_dragon_ice/boss_dragon_ice_1024x1024.png
diff --git a/assets/images/bosses/boss_dragon_ice/boss_dragon_ice_preview_256x256.png b/assets/images/bosses/boss_dragon_ice/boss_dragon_ice_preview_256x256.png
new file mode 100644
index 000000000..2f94adc22
Binary files /dev/null and b/assets/images/bosses/boss_dragon_ice/boss_dragon_ice_preview_256x256.png differ
diff --git a/assets/images/bosses/boss_golem.png b/assets/images/bosses/boss_golem/boss_golem_1024x1024.png
similarity index 100%
rename from assets/images/bosses/boss_golem.png
rename to assets/images/bosses/boss_golem/boss_golem_1024x1024.png
diff --git a/assets/images/bosses/boss_golem/boss_golem_preview_256x256.png b/assets/images/bosses/boss_golem/boss_golem_preview_256x256.png
new file mode 100644
index 000000000..b83d53c61
Binary files /dev/null and b/assets/images/bosses/boss_golem/boss_golem_preview_256x256.png differ
diff --git a/assets/images/bosses/boss_hydra.png b/assets/images/bosses/boss_hydra/boss_hydra_1024x1024.png
similarity index 100%
rename from assets/images/bosses/boss_hydra.png
rename to assets/images/bosses/boss_hydra/boss_hydra_1024x1024.png
diff --git a/assets/images/bosses/boss_hydra/boss_hydra_preview_256x256.png b/assets/images/bosses/boss_hydra/boss_hydra_preview_256x256.png
new file mode 100644
index 000000000..c98ee13c5
Binary files /dev/null and b/assets/images/bosses/boss_hydra/boss_hydra_preview_256x256.png differ
diff --git a/assets/images/bosses/boss_kraken.png b/assets/images/bosses/boss_kraken/boss_kraken_1024x1024.png
similarity index 100%
rename from assets/images/bosses/boss_kraken.png
rename to assets/images/bosses/boss_kraken/boss_kraken_1024x1024.png
diff --git a/assets/images/bosses/boss_kraken/boss_kraken_preview_256x256.png b/assets/images/bosses/boss_kraken/boss_kraken_preview_256x256.png
new file mode 100644
index 000000000..182a7f906
Binary files /dev/null and b/assets/images/bosses/boss_kraken/boss_kraken_preview_256x256.png differ
diff --git a/assets/images/bosses/boss_phoenix.png b/assets/images/bosses/boss_phoenix/boss_phoenix_1024x1024.png
similarity index 100%
rename from assets/images/bosses/boss_phoenix.png
rename to assets/images/bosses/boss_phoenix/boss_phoenix_1024x1024.png
diff --git a/assets/images/bosses/boss_phoenix/boss_phoenix_preview_256x256.png b/assets/images/bosses/boss_phoenix/boss_phoenix_preview_256x256.png
new file mode 100644
index 000000000..8ad099b74
Binary files /dev/null and b/assets/images/bosses/boss_phoenix/boss_phoenix_preview_256x256.png differ
diff --git a/assets/images/bosses/boss_slime_emperor.png b/assets/images/bosses/boss_slime_emperor/boss_slime_emperor_1024x1024.png
similarity index 100%
rename from assets/images/bosses/boss_slime_emperor.png
rename to assets/images/bosses/boss_slime_emperor/boss_slime_emperor_1024x1024.png
diff --git a/assets/images/bosses/boss_slime_emperor/boss_slime_emperor_preview_256x256.png b/assets/images/bosses/boss_slime_emperor/boss_slime_emperor_preview_256x256.png
new file mode 100644
index 000000000..005d9825e
Binary files /dev/null and b/assets/images/bosses/boss_slime_emperor/boss_slime_emperor_preview_256x256.png differ
diff --git a/assets/images/bosses/boss_spider_queen.png b/assets/images/bosses/boss_spider_queen/boss_spider_queen_1024x1024.png
similarity index 100%
rename from assets/images/bosses/boss_spider_queen.png
rename to assets/images/bosses/boss_spider_queen/boss_spider_queen_1024x1024.png
diff --git a/assets/images/bosses/boss_spider_queen/boss_spider_queen_preview_256x256.png b/assets/images/bosses/boss_spider_queen/boss_spider_queen_preview_256x256.png
new file mode 100644
index 000000000..23b50bf8f
Binary files /dev/null and b/assets/images/bosses/boss_spider_queen/boss_spider_queen_preview_256x256.png differ
diff --git a/assets/images/bosses/boss_treant.png b/assets/images/bosses/boss_treant/boss_treant_1024x1024.png
similarity index 100%
rename from assets/images/bosses/boss_treant.png
rename to assets/images/bosses/boss_treant/boss_treant_1024x1024.png
diff --git a/assets/images/bosses/boss_treant/boss_treant_preview_256x256.png b/assets/images/bosses/boss_treant/boss_treant_preview_256x256.png
new file mode 100644
index 000000000..eefee6d5d
Binary files /dev/null and b/assets/images/bosses/boss_treant/boss_treant_preview_256x256.png differ
diff --git a/assets/images/bosses/boss_trex.png b/assets/images/bosses/boss_trex/boss_trex_1024x1024.png
similarity index 100%
rename from assets/images/bosses/boss_trex.png
rename to assets/images/bosses/boss_trex/boss_trex_1024x1024.png
diff --git a/assets/images/bosses/boss_trex/boss_trex_preview_256x256.png b/assets/images/bosses/boss_trex/boss_trex_preview_256x256.png
new file mode 100644
index 000000000..380d75fd4
Binary files /dev/null and b/assets/images/bosses/boss_trex/boss_trex_preview_256x256.png differ
diff --git a/assets/images/bosses/boss_vampire.png b/assets/images/bosses/boss_vampire/boss_vampire_1024x1024.png
similarity index 100%
rename from assets/images/bosses/boss_vampire.png
rename to assets/images/bosses/boss_vampire/boss_vampire_1024x1024.png
diff --git a/assets/images/bosses/boss_vampire/boss_vampire_preview_256x256.png b/assets/images/bosses/boss_vampire/boss_vampire_preview_256x256.png
new file mode 100644
index 000000000..e2c7bf747
Binary files /dev/null and b/assets/images/bosses/boss_vampire/boss_vampire_preview_256x256.png differ
diff --git a/assets/images/bosses/boss_werewolf.png b/assets/images/bosses/boss_werewolf/boss_werewolf_1024x1024.png
similarity index 100%
rename from assets/images/bosses/boss_werewolf.png
rename to assets/images/bosses/boss_werewolf/boss_werewolf_1024x1024.png
diff --git a/assets/images/bosses/boss_werewolf/boss_werewolf_preview_256x256.png b/assets/images/bosses/boss_werewolf/boss_werewolf_preview_256x256.png
new file mode 100644
index 000000000..2dd84e665
Binary files /dev/null and b/assets/images/bosses/boss_werewolf/boss_werewolf_preview_256x256.png differ
diff --git a/assets/images/bosses/boss_zombie_king.png b/assets/images/bosses/boss_zombie_king/boss_zombie_king_1024x1024.png
similarity index 100%
rename from assets/images/bosses/boss_zombie_king.png
rename to assets/images/bosses/boss_zombie_king/boss_zombie_king_1024x1024.png
diff --git a/assets/images/bosses/boss_zombie_king/boss_zombie_king_preview_256x256.png b/assets/images/bosses/boss_zombie_king/boss_zombie_king_preview_256x256.png
new file mode 100644
index 000000000..e20a90672
Binary files /dev/null and b/assets/images/bosses/boss_zombie_king/boss_zombie_king_preview_256x256.png differ
diff --git a/assets/images/bosses/troll_king_sample.png b/assets/images/bosses/troll_king_sample.png
deleted file mode 100644
index 1c712a8fb..000000000
Binary files a/assets/images/bosses/troll_king_sample.png and /dev/null differ
diff --git a/assets/images/buildings/barn_complete.png b/assets/images/buildings/barn_complete/barn_complete_1024x1024.png
similarity index 100%
rename from assets/images/buildings/barn_complete.png
rename to assets/images/buildings/barn_complete/barn_complete_1024x1024.png
diff --git a/assets/images/buildings/barn_complete/barn_complete_preview_256x256.png b/assets/images/buildings/barn_complete/barn_complete_preview_256x256.png
new file mode 100644
index 000000000..083f8e5e0
Binary files /dev/null and b/assets/images/buildings/barn_complete/barn_complete_preview_256x256.png differ
diff --git a/assets/images/buildings/church_complete.png b/assets/images/buildings/church_complete/church_complete_1024x1024.png
similarity index 100%
rename from assets/images/buildings/church_complete.png
rename to assets/images/buildings/church_complete/church_complete_1024x1024.png
diff --git a/assets/images/buildings/church_complete/church_complete_preview_256x256.png b/assets/images/buildings/church_complete/church_complete_preview_256x256.png
new file mode 100644
index 000000000..5af3d5b7b
Binary files /dev/null and b/assets/images/buildings/church_complete/church_complete_preview_256x256.png differ
diff --git a/assets/images/buildings/church_ruined.png b/assets/images/buildings/church_ruined/church_ruined_1024x1024.png
similarity index 100%
rename from assets/images/buildings/church_ruined.png
rename to assets/images/buildings/church_ruined/church_ruined_1024x1024.png
diff --git a/assets/images/buildings/church_ruined/church_ruined_preview_256x256.png b/assets/images/buildings/church_ruined/church_ruined_preview_256x256.png
new file mode 100644
index 000000000..bf35ed165
Binary files /dev/null and b/assets/images/buildings/church_ruined/church_ruined_preview_256x256.png differ
diff --git a/assets/images/buildings/farmhouse_complete.png b/assets/images/buildings/farmhouse_complete/farmhouse_complete_1024x1024.png
similarity index 100%
rename from assets/images/buildings/farmhouse_complete.png
rename to assets/images/buildings/farmhouse_complete/farmhouse_complete_1024x1024.png
diff --git a/assets/images/buildings/farmhouse_complete/farmhouse_complete_preview_256x256.png b/assets/images/buildings/farmhouse_complete/farmhouse_complete_preview_256x256.png
new file mode 100644
index 000000000..8936ff8e5
Binary files /dev/null and b/assets/images/buildings/farmhouse_complete/farmhouse_complete_preview_256x256.png differ
diff --git a/assets/images/buildings/shack.png b/assets/images/buildings/shack/shack_1024x1024.png
similarity index 100%
rename from assets/images/buildings/shack.png
rename to assets/images/buildings/shack/shack_1024x1024.png
diff --git a/assets/images/buildings/shack/shack_preview_256x256.png b/assets/images/buildings/shack/shack_preview_256x256.png
new file mode 100644
index 000000000..c0d0bf548
Binary files /dev/null and b/assets/images/buildings/shack/shack_preview_256x256.png differ
diff --git a/assets/images/buildings/tent.png b/assets/images/buildings/tent/tent_1024x1024.png
similarity index 100%
rename from assets/images/buildings/tent.png
rename to assets/images/buildings/tent/tent_1024x1024.png
diff --git a/assets/images/buildings/tent/tent_preview_256x256.png b/assets/images/buildings/tent/tent_preview_256x256.png
new file mode 100644
index 000000000..59301ec0c
Binary files /dev/null and b/assets/images/buildings/tent/tent_preview_256x256.png differ
diff --git a/assets/images/environment/barrel_wood.png b/assets/images/environment/barrel_wood/barrel_wood_1024x1024.png
similarity index 100%
rename from assets/images/environment/barrel_wood.png
rename to assets/images/environment/barrel_wood/barrel_wood_1024x1024.png
diff --git a/assets/images/environment/barrel_wood/barrel_wood_preview_256x256.png b/assets/images/environment/barrel_wood/barrel_wood_preview_256x256.png
new file mode 100644
index 000000000..848b7bc3e
Binary files /dev/null and b/assets/images/environment/barrel_wood/barrel_wood_preview_256x256.png differ
diff --git a/assets/images/environment/bridge_wood.png b/assets/images/environment/bridge_wood/bridge_wood_1024x1024.png
similarity index 100%
rename from assets/images/environment/bridge_wood.png
rename to assets/images/environment/bridge_wood/bridge_wood_1024x1024.png
diff --git a/assets/images/environment/bridge_wood/bridge_wood_preview_256x256.png b/assets/images/environment/bridge_wood/bridge_wood_preview_256x256.png
new file mode 100644
index 000000000..dfda5464a
Binary files /dev/null and b/assets/images/environment/bridge_wood/bridge_wood_preview_256x256.png differ
diff --git a/assets/images/environment/building_house_wooden.png b/assets/images/environment/building_house_wooden/building_house_wooden_1024x1024.png
similarity index 100%
rename from assets/images/environment/building_house_wooden.png
rename to assets/images/environment/building_house_wooden/building_house_wooden_1024x1024.png
diff --git a/assets/images/environment/building_house_wooden/building_house_wooden_preview_256x256.png b/assets/images/environment/building_house_wooden/building_house_wooden_preview_256x256.png
new file mode 100644
index 000000000..9aef35341
Binary files /dev/null and b/assets/images/environment/building_house_wooden/building_house_wooden_preview_256x256.png differ
diff --git a/assets/images/environment/building_tower_watch.png b/assets/images/environment/building_tower_watch/building_tower_watch_1024x1024.png
similarity index 100%
rename from assets/images/environment/building_tower_watch.png
rename to assets/images/environment/building_tower_watch/building_tower_watch_1024x1024.png
diff --git a/assets/images/environment/building_tower_watch/building_tower_watch_preview_256x256.png b/assets/images/environment/building_tower_watch/building_tower_watch_preview_256x256.png
new file mode 100644
index 000000000..09db9efb2
Binary files /dev/null and b/assets/images/environment/building_tower_watch/building_tower_watch_preview_256x256.png differ
diff --git a/assets/images/environment/bush_berry.png b/assets/images/environment/bush_berry/bush_berry_1024x1024.png
similarity index 100%
rename from assets/images/environment/bush_berry.png
rename to assets/images/environment/bush_berry/bush_berry_1024x1024.png
diff --git a/assets/images/environment/bush_berry/bush_berry_preview_256x256.png b/assets/images/environment/bush_berry/bush_berry_preview_256x256.png
new file mode 100644
index 000000000..cbe03dabb
Binary files /dev/null and b/assets/images/environment/bush_berry/bush_berry_preview_256x256.png differ
diff --git a/assets/images/environment/bush_green.png b/assets/images/environment/bush_green/bush_green_1024x1024.png
similarity index 100%
rename from assets/images/environment/bush_green.png
rename to assets/images/environment/bush_green/bush_green_1024x1024.png
diff --git a/assets/images/environment/bush_green/bush_green_preview_256x256.png b/assets/images/environment/bush_green/bush_green_preview_256x256.png
new file mode 100644
index 000000000..2d101a1ca
Binary files /dev/null and b/assets/images/environment/bush_green/bush_green_preview_256x256.png differ
diff --git a/assets/images/environment/campfire.png b/assets/images/environment/campfire/campfire_1024x1024.png
similarity index 100%
rename from assets/images/environment/campfire.png
rename to assets/images/environment/campfire/campfire_1024x1024.png
diff --git a/assets/images/environment/campfire/campfire_preview_256x256.png b/assets/images/environment/campfire/campfire_preview_256x256.png
new file mode 100644
index 000000000..a9d9ed2e1
Binary files /dev/null and b/assets/images/environment/campfire/campfire_preview_256x256.png differ
diff --git a/assets/images/environment/car_rusted.png b/assets/images/environment/car_rusted/car_rusted_1024x1024.png
similarity index 100%
rename from assets/images/environment/car_rusted.png
rename to assets/images/environment/car_rusted/car_rusted_1024x1024.png
diff --git a/assets/images/environment/car_rusted/car_rusted_preview_256x256.png b/assets/images/environment/car_rusted/car_rusted_preview_256x256.png
new file mode 100644
index 000000000..9cbc72ff8
Binary files /dev/null and b/assets/images/environment/car_rusted/car_rusted_preview_256x256.png differ
diff --git a/assets/images/environment/chest_wooden.png b/assets/images/environment/chest_wooden/chest_wooden_1024x1024.png
similarity index 100%
rename from assets/images/environment/chest_wooden.png
rename to assets/images/environment/chest_wooden/chest_wooden_1024x1024.png
diff --git a/assets/images/environment/chest_wooden/chest_wooden_preview_256x256.png b/assets/images/environment/chest_wooden/chest_wooden_preview_256x256.png
new file mode 100644
index 000000000..b239b1aa2
Binary files /dev/null and b/assets/images/environment/chest_wooden/chest_wooden_preview_256x256.png differ
diff --git a/assets/images/environment/crate_wooden.png b/assets/images/environment/crate_wooden/crate_wooden_1024x1024.png
similarity index 100%
rename from assets/images/environment/crate_wooden.png
rename to assets/images/environment/crate_wooden/crate_wooden_1024x1024.png
diff --git a/assets/images/environment/crate_wooden/crate_wooden_preview_256x256.png b/assets/images/environment/crate_wooden/crate_wooden_preview_256x256.png
new file mode 100644
index 000000000..c3ecdb54f
Binary files /dev/null and b/assets/images/environment/crate_wooden/crate_wooden_preview_256x256.png differ
diff --git a/assets/images/environment/fence.png b/assets/images/environment/fence/fence_1024x1024.png
similarity index 100%
rename from assets/images/environment/fence.png
rename to assets/images/environment/fence/fence_1024x1024.png
diff --git a/assets/images/environment/fence/fence_preview_256x256.png b/assets/images/environment/fence/fence_preview_256x256.png
new file mode 100644
index 000000000..5bced327f
Binary files /dev/null and b/assets/images/environment/fence/fence_preview_256x256.png differ
diff --git a/assets/images/environment/fence_wood.png b/assets/images/environment/fence_wood/fence_wood_1024x1024.png
similarity index 100%
rename from assets/images/environment/fence_wood.png
rename to assets/images/environment/fence_wood/fence_wood_1024x1024.png
diff --git a/assets/images/environment/fence_wood/fence_wood_preview_256x256.png b/assets/images/environment/fence_wood/fence_wood_preview_256x256.png
new file mode 100644
index 000000000..a89b60c37
Binary files /dev/null and b/assets/images/environment/fence_wood/fence_wood_preview_256x256.png differ
diff --git a/assets/images/environment/flower_blue.png b/assets/images/environment/flower_blue/flower_blue_1024x1024.png
similarity index 100%
rename from assets/images/environment/flower_blue.png
rename to assets/images/environment/flower_blue/flower_blue_1024x1024.png
diff --git a/assets/images/environment/flower_blue/flower_blue_preview_256x256.png b/assets/images/environment/flower_blue/flower_blue_preview_256x256.png
new file mode 100644
index 000000000..315b957d9
Binary files /dev/null and b/assets/images/environment/flower_blue/flower_blue_preview_256x256.png differ
diff --git a/assets/images/environment/flower_red.png b/assets/images/environment/flower_red/flower_red_1024x1024.png
similarity index 100%
rename from assets/images/environment/flower_red.png
rename to assets/images/environment/flower_red/flower_red_1024x1024.png
diff --git a/assets/images/environment/flower_red/flower_red_preview_256x256.png b/assets/images/environment/flower_red/flower_red_preview_256x256.png
new file mode 100644
index 000000000..89a5263d1
Binary files /dev/null and b/assets/images/environment/flower_red/flower_red_preview_256x256.png differ
diff --git a/assets/images/environment/gate_wood.png b/assets/images/environment/gate_wood/gate_wood_1024x1024.png
similarity index 100%
rename from assets/images/environment/gate_wood.png
rename to assets/images/environment/gate_wood/gate_wood_1024x1024.png
diff --git a/assets/images/environment/gate_wood/gate_wood_preview_256x256.png b/assets/images/environment/gate_wood/gate_wood_preview_256x256.png
new file mode 100644
index 000000000..ac9c3eb8e
Binary files /dev/null and b/assets/images/environment/gate_wood/gate_wood_preview_256x256.png differ
diff --git a/assets/images/environment/mushroom_brown.png b/assets/images/environment/mushroom_brown/mushroom_brown_1024x1024.png
similarity index 100%
rename from assets/images/environment/mushroom_brown.png
rename to assets/images/environment/mushroom_brown/mushroom_brown_1024x1024.png
diff --git a/assets/images/environment/mushroom_brown/mushroom_brown_preview_256x256.png b/assets/images/environment/mushroom_brown/mushroom_brown_preview_256x256.png
new file mode 100644
index 000000000..bab138c60
Binary files /dev/null and b/assets/images/environment/mushroom_brown/mushroom_brown_preview_256x256.png differ
diff --git a/assets/images/environment/mushroom_red.png b/assets/images/environment/mushroom_red/mushroom_red_1024x1024.png
similarity index 100%
rename from assets/images/environment/mushroom_red.png
rename to assets/images/environment/mushroom_red/mushroom_red_1024x1024.png
diff --git a/assets/images/environment/mushroom_red/mushroom_red_preview_256x256.png b/assets/images/environment/mushroom_red/mushroom_red_preview_256x256.png
new file mode 100644
index 000000000..98e3f4a59
Binary files /dev/null and b/assets/images/environment/mushroom_red/mushroom_red_preview_256x256.png differ
diff --git a/assets/images/environment/oak_tree_sample.png b/assets/images/environment/oak_tree_sample.png
deleted file mode 100644
index 7384628a5..000000000
Binary files a/assets/images/environment/oak_tree_sample.png and /dev/null differ
diff --git a/assets/images/environment/rock_large.png b/assets/images/environment/rock_large/rock_large_1024x1024.png
similarity index 100%
rename from assets/images/environment/rock_large.png
rename to assets/images/environment/rock_large/rock_large_1024x1024.png
diff --git a/assets/images/environment/rock_large/rock_large_preview_256x256.png b/assets/images/environment/rock_large/rock_large_preview_256x256.png
new file mode 100644
index 000000000..33d3b48db
Binary files /dev/null and b/assets/images/environment/rock_large/rock_large_preview_256x256.png differ
diff --git a/assets/images/environment/ruin_wall.png b/assets/images/environment/ruin_wall/ruin_wall_1024x1024.png
similarity index 100%
rename from assets/images/environment/ruin_wall.png
rename to assets/images/environment/ruin_wall/ruin_wall_1024x1024.png
diff --git a/assets/images/environment/ruin_wall/ruin_wall_preview_256x256.png b/assets/images/environment/ruin_wall/ruin_wall_preview_256x256.png
new file mode 100644
index 000000000..e800d7fb5
Binary files /dev/null and b/assets/images/environment/ruin_wall/ruin_wall_preview_256x256.png differ
diff --git a/assets/images/environment/sign_warning.png b/assets/images/environment/sign_warning/sign_warning_1024x1024.png
similarity index 100%
rename from assets/images/environment/sign_warning.png
rename to assets/images/environment/sign_warning/sign_warning_1024x1024.png
diff --git a/assets/images/environment/sign_warning/sign_warning_preview_256x256.png b/assets/images/environment/sign_warning/sign_warning_preview_256x256.png
new file mode 100644
index 000000000..06f7c472a
Binary files /dev/null and b/assets/images/environment/sign_warning/sign_warning_preview_256x256.png differ
diff --git a/assets/images/environment/tile_dirt_brown.png b/assets/images/environment/tile_dirt_brown/tile_dirt_brown_1024x1024.png
similarity index 100%
rename from assets/images/environment/tile_dirt_brown.png
rename to assets/images/environment/tile_dirt_brown/tile_dirt_brown_1024x1024.png
diff --git a/assets/images/environment/tile_dirt_brown/tile_dirt_brown_preview_256x256.png b/assets/images/environment/tile_dirt_brown/tile_dirt_brown_preview_256x256.png
new file mode 100644
index 000000000..a98f354e2
Binary files /dev/null and b/assets/images/environment/tile_dirt_brown/tile_dirt_brown_preview_256x256.png differ
diff --git a/assets/images/environment/tile_grass_dry.png b/assets/images/environment/tile_grass_dry/tile_grass_dry_1024x1024.png
similarity index 100%
rename from assets/images/environment/tile_grass_dry.png
rename to assets/images/environment/tile_grass_dry/tile_grass_dry_1024x1024.png
diff --git a/assets/images/environment/tile_grass_dry/tile_grass_dry_preview_256x256.png b/assets/images/environment/tile_grass_dry/tile_grass_dry_preview_256x256.png
new file mode 100644
index 000000000..be128e6c2
Binary files /dev/null and b/assets/images/environment/tile_grass_dry/tile_grass_dry_preview_256x256.png differ
diff --git a/assets/images/environment/tile_grass_green.png b/assets/images/environment/tile_grass_green/tile_grass_green_1024x1024.png
similarity index 100%
rename from assets/images/environment/tile_grass_green.png
rename to assets/images/environment/tile_grass_green/tile_grass_green_1024x1024.png
diff --git a/assets/images/environment/tile_grass_green/tile_grass_green_preview_256x256.png b/assets/images/environment/tile_grass_green/tile_grass_green_preview_256x256.png
new file mode 100644
index 000000000..832dc2287
Binary files /dev/null and b/assets/images/environment/tile_grass_green/tile_grass_green_preview_256x256.png differ
diff --git a/assets/images/environment/tile_sand_yellow.png b/assets/images/environment/tile_sand_yellow/tile_sand_yellow_1024x1024.png
similarity index 100%
rename from assets/images/environment/tile_sand_yellow.png
rename to assets/images/environment/tile_sand_yellow/tile_sand_yellow_1024x1024.png
diff --git a/assets/images/environment/tile_sand_yellow/tile_sand_yellow_preview_256x256.png b/assets/images/environment/tile_sand_yellow/tile_sand_yellow_preview_256x256.png
new file mode 100644
index 000000000..9a0e17d64
Binary files /dev/null and b/assets/images/environment/tile_sand_yellow/tile_sand_yellow_preview_256x256.png differ
diff --git a/assets/images/environment/tile_snow_white.png b/assets/images/environment/tile_snow_white/tile_snow_white_1024x1024.png
similarity index 100%
rename from assets/images/environment/tile_snow_white.png
rename to assets/images/environment/tile_snow_white/tile_snow_white_1024x1024.png
diff --git a/assets/images/environment/tile_snow_white/tile_snow_white_preview_256x256.png b/assets/images/environment/tile_snow_white/tile_snow_white_preview_256x256.png
new file mode 100644
index 000000000..0c9a57ef1
Binary files /dev/null and b/assets/images/environment/tile_snow_white/tile_snow_white_preview_256x256.png differ
diff --git a/assets/images/environment/tile_stone_grey.png b/assets/images/environment/tile_stone_grey/tile_stone_grey_1024x1024.png
similarity index 100%
rename from assets/images/environment/tile_stone_grey.png
rename to assets/images/environment/tile_stone_grey/tile_stone_grey_1024x1024.png
diff --git a/assets/images/environment/tile_stone_grey/tile_stone_grey_preview_256x256.png b/assets/images/environment/tile_stone_grey/tile_stone_grey_preview_256x256.png
new file mode 100644
index 000000000..24dada266
Binary files /dev/null and b/assets/images/environment/tile_stone_grey/tile_stone_grey_preview_256x256.png differ
diff --git a/assets/images/environment/tile_water_shallow.png b/assets/images/environment/tile_water_shallow/tile_water_shallow_1024x1024.png
similarity index 100%
rename from assets/images/environment/tile_water_shallow.png
rename to assets/images/environment/tile_water_shallow/tile_water_shallow_1024x1024.png
diff --git a/assets/images/environment/tile_water_shallow/tile_water_shallow_preview_256x256.png b/assets/images/environment/tile_water_shallow/tile_water_shallow_preview_256x256.png
new file mode 100644
index 000000000..344be5c8e
Binary files /dev/null and b/assets/images/environment/tile_water_shallow/tile_water_shallow_preview_256x256.png differ
diff --git a/assets/images/environment/tree_cherry.png b/assets/images/environment/tree_cherry/tree_cherry_1024x1024.png
similarity index 100%
rename from assets/images/environment/tree_cherry.png
rename to assets/images/environment/tree_cherry/tree_cherry_1024x1024.png
diff --git a/assets/images/environment/tree_cherry/tree_cherry_preview_256x256.png b/assets/images/environment/tree_cherry/tree_cherry_preview_256x256.png
new file mode 100644
index 000000000..dd2e76e8f
Binary files /dev/null and b/assets/images/environment/tree_cherry/tree_cherry_preview_256x256.png differ
diff --git a/assets/images/environment/tree_dead.png b/assets/images/environment/tree_dead/tree_dead_1024x1024.png
similarity index 100%
rename from assets/images/environment/tree_dead.png
rename to assets/images/environment/tree_dead/tree_dead_1024x1024.png
diff --git a/assets/images/environment/tree_dead/tree_dead_preview_256x256.png b/assets/images/environment/tree_dead/tree_dead_preview_256x256.png
new file mode 100644
index 000000000..75b21a57c
Binary files /dev/null and b/assets/images/environment/tree_dead/tree_dead_preview_256x256.png differ
diff --git a/assets/images/environment/tree_oak.png b/assets/images/environment/tree_oak/tree_oak_1024x1024.png
similarity index 100%
rename from assets/images/environment/tree_oak.png
rename to assets/images/environment/tree_oak/tree_oak_1024x1024.png
diff --git a/assets/images/environment/tree_oak/tree_oak_preview_256x256.png b/assets/images/environment/tree_oak/tree_oak_preview_256x256.png
new file mode 100644
index 000000000..bbe35ce5c
Binary files /dev/null and b/assets/images/environment/tree_oak/tree_oak_preview_256x256.png differ
diff --git a/assets/images/environment/tree_pine.png b/assets/images/environment/tree_pine/tree_pine_1024x1024.png
similarity index 100%
rename from assets/images/environment/tree_pine.png
rename to assets/images/environment/tree_pine/tree_pine_1024x1024.png
diff --git a/assets/images/environment/tree_pine/tree_pine_preview_256x256.png b/assets/images/environment/tree_pine/tree_pine_preview_256x256.png
new file mode 100644
index 000000000..37e246db2
Binary files /dev/null and b/assets/images/environment/tree_pine/tree_pine_preview_256x256.png differ
diff --git a/assets/images/items/ana_bracelet.png b/assets/images/items/ana_bracelet/ana_bracelet_1024x1024.png
similarity index 100%
rename from assets/images/items/ana_bracelet.png
rename to assets/images/items/ana_bracelet/ana_bracelet_1024x1024.png
diff --git a/assets/images/items/ana_bracelet/ana_bracelet_preview_256x256.png b/assets/images/items/ana_bracelet/ana_bracelet_preview_256x256.png
new file mode 100644
index 000000000..521e9700d
Binary files /dev/null and b/assets/images/items/ana_bracelet/ana_bracelet_preview_256x256.png differ
diff --git a/assets/images/items/apple_red.png b/assets/images/items/apple_red/apple_red_1024x1024.png
similarity index 100%
rename from assets/images/items/apple_red.png
rename to assets/images/items/apple_red/apple_red_1024x1024.png
diff --git a/assets/images/items/apple_red/apple_red_preview_256x256.png b/assets/images/items/apple_red/apple_red_preview_256x256.png
new file mode 100644
index 000000000..23d008991
Binary files /dev/null and b/assets/images/items/apple_red/apple_red_preview_256x256.png differ
diff --git a/assets/images/items/armor_leather.png b/assets/images/items/armor_leather/armor_leather_1024x1024.png
similarity index 100%
rename from assets/images/items/armor_leather.png
rename to assets/images/items/armor_leather/armor_leather_1024x1024.png
diff --git a/assets/images/items/armor_leather/armor_leather_preview_256x256.png b/assets/images/items/armor_leather/armor_leather_preview_256x256.png
new file mode 100644
index 000000000..edf360aeb
Binary files /dev/null and b/assets/images/items/armor_leather/armor_leather_preview_256x256.png differ
diff --git a/assets/images/items/armor_metal.png b/assets/images/items/armor_metal/armor_metal_1024x1024.png
similarity index 100%
rename from assets/images/items/armor_metal.png
rename to assets/images/items/armor_metal/armor_metal_1024x1024.png
diff --git a/assets/images/items/armor_metal/armor_metal_preview_256x256.png b/assets/images/items/armor_metal/armor_metal_preview_256x256.png
new file mode 100644
index 000000000..76b177cd4
Binary files /dev/null and b/assets/images/items/armor_metal/armor_metal_preview_256x256.png differ
diff --git a/assets/images/items/backpack_large.png b/assets/images/items/backpack_large/backpack_large_1024x1024.png
similarity index 100%
rename from assets/images/items/backpack_large.png
rename to assets/images/items/backpack_large/backpack_large_1024x1024.png
diff --git a/assets/images/items/backpack_large/backpack_large_preview_256x256.png b/assets/images/items/backpack_large/backpack_large_preview_256x256.png
new file mode 100644
index 000000000..bc9426223
Binary files /dev/null and b/assets/images/items/backpack_large/backpack_large_preview_256x256.png differ
diff --git a/assets/images/items/backpack_leather.png b/assets/images/items/backpack_leather/backpack_leather_1024x1024.png
similarity index 100%
rename from assets/images/items/backpack_leather.png
rename to assets/images/items/backpack_leather/backpack_leather_1024x1024.png
diff --git a/assets/images/items/backpack_leather/backpack_leather_preview_256x256.png b/assets/images/items/backpack_leather/backpack_leather_preview_256x256.png
new file mode 100644
index 000000000..362313ef1
Binary files /dev/null and b/assets/images/items/backpack_leather/backpack_leather_preview_256x256.png differ
diff --git a/assets/images/items/backpack_small.png b/assets/images/items/backpack_small/backpack_small_1024x1024.png
similarity index 100%
rename from assets/images/items/backpack_small.png
rename to assets/images/items/backpack_small/backpack_small_1024x1024.png
diff --git a/assets/images/items/backpack_small/backpack_small_preview_256x256.png b/assets/images/items/backpack_small/backpack_small_preview_256x256.png
new file mode 100644
index 000000000..4556ada85
Binary files /dev/null and b/assets/images/items/backpack_small/backpack_small_preview_256x256.png differ
diff --git a/assets/images/items/berry_blue.png b/assets/images/items/berry_blue/berry_blue_1024x1024.png
similarity index 100%
rename from assets/images/items/berry_blue.png
rename to assets/images/items/berry_blue/berry_blue_1024x1024.png
diff --git a/assets/images/items/berry_blue/berry_blue_preview_256x256.png b/assets/images/items/berry_blue/berry_blue_preview_256x256.png
new file mode 100644
index 000000000..720829a4f
Binary files /dev/null and b/assets/images/items/berry_blue/berry_blue_preview_256x256.png differ
diff --git a/assets/images/items/bottle_empty.png b/assets/images/items/bottle_empty/bottle_empty_1024x1024.png
similarity index 100%
rename from assets/images/items/bottle_empty.png
rename to assets/images/items/bottle_empty/bottle_empty_1024x1024.png
diff --git a/assets/images/items/bottle_empty/bottle_empty_preview_256x256.png b/assets/images/items/bottle_empty/bottle_empty_preview_256x256.png
new file mode 100644
index 000000000..b8de98c3f
Binary files /dev/null and b/assets/images/items/bottle_empty/bottle_empty_preview_256x256.png differ
diff --git a/assets/images/items/carrot.png b/assets/images/items/carrot/carrot_1024x1024.png
similarity index 100%
rename from assets/images/items/carrot.png
rename to assets/images/items/carrot/carrot_1024x1024.png
diff --git a/assets/images/items/carrot/carrot_preview_256x256.png b/assets/images/items/carrot/carrot_preview_256x256.png
new file mode 100644
index 000000000..07146195a
Binary files /dev/null and b/assets/images/items/carrot/carrot_preview_256x256.png differ
diff --git a/assets/images/items/cloth_bundle.png b/assets/images/items/cloth_bundle/cloth_bundle_1024x1024.png
similarity index 100%
rename from assets/images/items/cloth_bundle.png
rename to assets/images/items/cloth_bundle/cloth_bundle_1024x1024.png
diff --git a/assets/images/items/cloth_bundle/cloth_bundle_preview_256x256.png b/assets/images/items/cloth_bundle/cloth_bundle_preview_256x256.png
new file mode 100644
index 000000000..66dbc25ee
Binary files /dev/null and b/assets/images/items/cloth_bundle/cloth_bundle_preview_256x256.png differ
diff --git a/assets/images/items/egg_white.png b/assets/images/items/egg_white/egg_white_1024x1024.png
similarity index 100%
rename from assets/images/items/egg_white.png
rename to assets/images/items/egg_white/egg_white_1024x1024.png
diff --git a/assets/images/items/egg_white/egg_white_preview_256x256.png b/assets/images/items/egg_white/egg_white_preview_256x256.png
new file mode 100644
index 000000000..5178df32f
Binary files /dev/null and b/assets/images/items/egg_white/egg_white_preview_256x256.png differ
diff --git a/assets/images/items/fish_raw.png b/assets/images/items/fish_raw/fish_raw_1024x1024.png
similarity index 100%
rename from assets/images/items/fish_raw.png
rename to assets/images/items/fish_raw/fish_raw_1024x1024.png
diff --git a/assets/images/items/fish_raw/fish_raw_preview_256x256.png b/assets/images/items/fish_raw/fish_raw_preview_256x256.png
new file mode 100644
index 000000000..058c708a8
Binary files /dev/null and b/assets/images/items/fish_raw/fish_raw_preview_256x256.png differ
diff --git a/assets/images/items/food_apple.png b/assets/images/items/food_apple/food_apple_1024x1024.png
similarity index 100%
rename from assets/images/items/food_apple.png
rename to assets/images/items/food_apple/food_apple_1024x1024.png
diff --git a/assets/images/items/food_apple/food_apple_preview_256x256.png b/assets/images/items/food_apple/food_apple_preview_256x256.png
new file mode 100644
index 000000000..12795a3cf
Binary files /dev/null and b/assets/images/items/food_apple/food_apple_preview_256x256.png differ
diff --git a/assets/images/items/food_bread.png b/assets/images/items/food_bread/food_bread_1024x1024.png
similarity index 100%
rename from assets/images/items/food_bread.png
rename to assets/images/items/food_bread/food_bread_1024x1024.png
diff --git a/assets/images/items/food_bread/food_bread_preview_256x256.png b/assets/images/items/food_bread/food_bread_preview_256x256.png
new file mode 100644
index 000000000..d0af2b59d
Binary files /dev/null and b/assets/images/items/food_bread/food_bread_preview_256x256.png differ
diff --git a/assets/images/items/food_meat.png b/assets/images/items/food_meat/food_meat_1024x1024.png
similarity index 100%
rename from assets/images/items/food_meat.png
rename to assets/images/items/food_meat/food_meat_1024x1024.png
diff --git a/assets/images/items/food_meat/food_meat_preview_256x256.png b/assets/images/items/food_meat/food_meat_preview_256x256.png
new file mode 100644
index 000000000..fb5ef8330
Binary files /dev/null and b/assets/images/items/food_meat/food_meat_preview_256x256.png differ
diff --git a/assets/images/items/gas_mask.png b/assets/images/items/gas_mask/gas_mask_1024x1024.png
similarity index 100%
rename from assets/images/items/gas_mask.png
rename to assets/images/items/gas_mask/gas_mask_1024x1024.png
diff --git a/assets/images/items/gas_mask/gas_mask_preview_256x256.png b/assets/images/items/gas_mask/gas_mask_preview_256x256.png
new file mode 100644
index 000000000..0bfb794e5
Binary files /dev/null and b/assets/images/items/gas_mask/gas_mask_preview_256x256.png differ
diff --git a/assets/images/items/gronk_vape.png b/assets/images/items/gronk_vape/gronk_vape_1024x1024.png
similarity index 100%
rename from assets/images/items/gronk_vape.png
rename to assets/images/items/gronk_vape/gronk_vape_1024x1024.png
diff --git a/assets/images/items/gronk_vape/gronk_vape_preview_256x256.png b/assets/images/items/gronk_vape/gronk_vape_preview_256x256.png
new file mode 100644
index 000000000..2728439bb
Binary files /dev/null and b/assets/images/items/gronk_vape/gronk_vape_preview_256x256.png differ
diff --git a/assets/images/items/helmet_metal.png b/assets/images/items/helmet_metal/helmet_metal_1024x1024.png
similarity index 100%
rename from assets/images/items/helmet_metal.png
rename to assets/images/items/helmet_metal/helmet_metal_1024x1024.png
diff --git a/assets/images/items/helmet_metal/helmet_metal_preview_256x256.png b/assets/images/items/helmet_metal/helmet_metal_preview_256x256.png
new file mode 100644
index 000000000..3068fbe3a
Binary files /dev/null and b/assets/images/items/helmet_metal/helmet_metal_preview_256x256.png differ
diff --git a/assets/images/items/ore_gold.png b/assets/images/items/ore_gold/ore_gold_1024x1024.png
similarity index 100%
rename from assets/images/items/ore_gold.png
rename to assets/images/items/ore_gold/ore_gold_1024x1024.png
diff --git a/assets/images/items/ore_gold/ore_gold_preview_256x256.png b/assets/images/items/ore_gold/ore_gold_preview_256x256.png
new file mode 100644
index 000000000..fa6782caa
Binary files /dev/null and b/assets/images/items/ore_gold/ore_gold_preview_256x256.png differ
diff --git a/assets/images/items/ore_iron.png b/assets/images/items/ore_iron/ore_iron_1024x1024.png
similarity index 100%
rename from assets/images/items/ore_iron.png
rename to assets/images/items/ore_iron/ore_iron_1024x1024.png
diff --git a/assets/images/items/ore_iron/ore_iron_preview_256x256.png b/assets/images/items/ore_iron/ore_iron_preview_256x256.png
new file mode 100644
index 000000000..6bfd4ed62
Binary files /dev/null and b/assets/images/items/ore_iron/ore_iron_preview_256x256.png differ
diff --git a/assets/images/items/potion_health.png b/assets/images/items/potion_health/potion_health_1024x1024.png
similarity index 100%
rename from assets/images/items/potion_health.png
rename to assets/images/items/potion_health/potion_health_1024x1024.png
diff --git a/assets/images/items/potion_health/potion_health_preview_256x256.png b/assets/images/items/potion_health/potion_health_preview_256x256.png
new file mode 100644
index 000000000..1da8d3500
Binary files /dev/null and b/assets/images/items/potion_health/potion_health_preview_256x256.png differ
diff --git a/assets/images/items/potion_mana.png b/assets/images/items/potion_mana/potion_mana_1024x1024.png
similarity index 100%
rename from assets/images/items/potion_mana.png
rename to assets/images/items/potion_mana/potion_mana_1024x1024.png
diff --git a/assets/images/items/potion_mana/potion_mana_preview_256x256.png b/assets/images/items/potion_mana/potion_mana_preview_256x256.png
new file mode 100644
index 000000000..76c2a22f0
Binary files /dev/null and b/assets/images/items/potion_mana/potion_mana_preview_256x256.png differ
diff --git a/assets/images/items/rope_coil.png b/assets/images/items/rope_coil/rope_coil_1024x1024.png
similarity index 100%
rename from assets/images/items/rope_coil.png
rename to assets/images/items/rope_coil/rope_coil_1024x1024.png
diff --git a/assets/images/items/rope_coil/rope_coil_preview_256x256.png b/assets/images/items/rope_coil/rope_coil_preview_256x256.png
new file mode 100644
index 000000000..ad48a14dc
Binary files /dev/null and b/assets/images/items/rope_coil/rope_coil_preview_256x256.png differ
diff --git a/assets/images/items/seed_bag.png b/assets/images/items/seed_bag/seed_bag_1024x1024.png
similarity index 100%
rename from assets/images/items/seed_bag.png
rename to assets/images/items/seed_bag/seed_bag_1024x1024.png
diff --git a/assets/images/items/seed_bag/seed_bag_preview_256x256.png b/assets/images/items/seed_bag/seed_bag_preview_256x256.png
new file mode 100644
index 000000000..099417c59
Binary files /dev/null and b/assets/images/items/seed_bag/seed_bag_preview_256x256.png differ
diff --git a/assets/images/items/stone_pile.png b/assets/images/items/stone_pile/stone_pile_1024x1024.png
similarity index 100%
rename from assets/images/items/stone_pile.png
rename to assets/images/items/stone_pile/stone_pile_1024x1024.png
diff --git a/assets/images/items/stone_pile/stone_pile_preview_256x256.png b/assets/images/items/stone_pile/stone_pile_preview_256x256.png
new file mode 100644
index 000000000..bb62835bb
Binary files /dev/null and b/assets/images/items/stone_pile/stone_pile_preview_256x256.png differ
diff --git a/assets/images/items/storage_chest.png b/assets/images/items/storage_chest/storage_chest_1024x1024.png
similarity index 100%
rename from assets/images/items/storage_chest.png
rename to assets/images/items/storage_chest/storage_chest_1024x1024.png
diff --git a/assets/images/items/storage_chest/storage_chest_preview_256x256.png b/assets/images/items/storage_chest/storage_chest_preview_256x256.png
new file mode 100644
index 000000000..11d76908e
Binary files /dev/null and b/assets/images/items/storage_chest/storage_chest_preview_256x256.png differ
diff --git a/assets/images/items/tool_axe_iron.png b/assets/images/items/tool_axe_iron/tool_axe_iron_1024x1024.png
similarity index 100%
rename from assets/images/items/tool_axe_iron.png
rename to assets/images/items/tool_axe_iron/tool_axe_iron_1024x1024.png
diff --git a/assets/images/items/tool_axe_iron/tool_axe_iron_preview_256x256.png b/assets/images/items/tool_axe_iron/tool_axe_iron_preview_256x256.png
new file mode 100644
index 000000000..f05b46320
Binary files /dev/null and b/assets/images/items/tool_axe_iron/tool_axe_iron_preview_256x256.png differ
diff --git a/assets/images/items/tool_hammer.png b/assets/images/items/tool_hammer/tool_hammer_1024x1024.png
similarity index 100%
rename from assets/images/items/tool_hammer.png
rename to assets/images/items/tool_hammer/tool_hammer_1024x1024.png
diff --git a/assets/images/items/tool_hammer/tool_hammer_preview_256x256.png b/assets/images/items/tool_hammer/tool_hammer_preview_256x256.png
new file mode 100644
index 000000000..e4d75c501
Binary files /dev/null and b/assets/images/items/tool_hammer/tool_hammer_preview_256x256.png differ
diff --git a/assets/images/items/tool_pickaxe_iron.png b/assets/images/items/tool_pickaxe_iron/tool_pickaxe_iron_1024x1024.png
similarity index 100%
rename from assets/images/items/tool_pickaxe_iron.png
rename to assets/images/items/tool_pickaxe_iron/tool_pickaxe_iron_1024x1024.png
diff --git a/assets/images/items/tool_pickaxe_iron/tool_pickaxe_iron_preview_256x256.png b/assets/images/items/tool_pickaxe_iron/tool_pickaxe_iron_preview_256x256.png
new file mode 100644
index 000000000..88d2b0977
Binary files /dev/null and b/assets/images/items/tool_pickaxe_iron/tool_pickaxe_iron_preview_256x256.png differ
diff --git a/assets/images/items/tool_shovel.png b/assets/images/items/tool_shovel/tool_shovel_1024x1024.png
similarity index 100%
rename from assets/images/items/tool_shovel.png
rename to assets/images/items/tool_shovel/tool_shovel_1024x1024.png
diff --git a/assets/images/items/tool_shovel/tool_shovel_preview_256x256.png b/assets/images/items/tool_shovel/tool_shovel_preview_256x256.png
new file mode 100644
index 000000000..a92a28ed7
Binary files /dev/null and b/assets/images/items/tool_shovel/tool_shovel_preview_256x256.png differ
diff --git a/assets/images/items/wand_earth.png b/assets/images/items/wand_earth/wand_earth_1024x1024.png
similarity index 100%
rename from assets/images/items/wand_earth.png
rename to assets/images/items/wand_earth/wand_earth_1024x1024.png
diff --git a/assets/images/items/wand_earth/wand_earth_preview_256x256.png b/assets/images/items/wand_earth/wand_earth_preview_256x256.png
new file mode 100644
index 000000000..c6a797d14
Binary files /dev/null and b/assets/images/items/wand_earth/wand_earth_preview_256x256.png differ
diff --git a/assets/images/items/wand_fire.png b/assets/images/items/wand_fire/wand_fire_1024x1024.png
similarity index 100%
rename from assets/images/items/wand_fire.png
rename to assets/images/items/wand_fire/wand_fire_1024x1024.png
diff --git a/assets/images/items/wand_fire/wand_fire_preview_256x256.png b/assets/images/items/wand_fire/wand_fire_preview_256x256.png
new file mode 100644
index 000000000..0d50aadc5
Binary files /dev/null and b/assets/images/items/wand_fire/wand_fire_preview_256x256.png differ
diff --git a/assets/images/items/wand_healing.png b/assets/images/items/wand_healing/wand_healing_1024x1024.png
similarity index 100%
rename from assets/images/items/wand_healing.png
rename to assets/images/items/wand_healing/wand_healing_1024x1024.png
diff --git a/assets/images/items/wand_healing/wand_healing_preview_256x256.png b/assets/images/items/wand_healing/wand_healing_preview_256x256.png
new file mode 100644
index 000000000..88dc3b38a
Binary files /dev/null and b/assets/images/items/wand_healing/wand_healing_preview_256x256.png differ
diff --git a/assets/images/items/wand_ice.png b/assets/images/items/wand_ice/wand_ice_1024x1024.png
similarity index 100%
rename from assets/images/items/wand_ice.png
rename to assets/images/items/wand_ice/wand_ice_1024x1024.png
diff --git a/assets/images/items/wand_ice/wand_ice_preview_256x256.png b/assets/images/items/wand_ice/wand_ice_preview_256x256.png
new file mode 100644
index 000000000..5a1185184
Binary files /dev/null and b/assets/images/items/wand_ice/wand_ice_preview_256x256.png differ
diff --git a/assets/images/items/wand_lightning.png b/assets/images/items/wand_lightning/wand_lightning_1024x1024.png
similarity index 100%
rename from assets/images/items/wand_lightning.png
rename to assets/images/items/wand_lightning/wand_lightning_1024x1024.png
diff --git a/assets/images/items/wand_lightning/wand_lightning_preview_256x256.png b/assets/images/items/wand_lightning/wand_lightning_preview_256x256.png
new file mode 100644
index 000000000..af582fe29
Binary files /dev/null and b/assets/images/items/wand_lightning/wand_lightning_preview_256x256.png differ
diff --git a/assets/images/items/wand_shadow.png b/assets/images/items/wand_shadow/wand_shadow_1024x1024.png
similarity index 100%
rename from assets/images/items/wand_shadow.png
rename to assets/images/items/wand_shadow/wand_shadow_1024x1024.png
diff --git a/assets/images/items/wand_shadow/wand_shadow_preview_256x256.png b/assets/images/items/wand_shadow/wand_shadow_preview_256x256.png
new file mode 100644
index 000000000..ccdbcd24c
Binary files /dev/null and b/assets/images/items/wand_shadow/wand_shadow_preview_256x256.png differ
diff --git a/assets/images/items/weapon_bow.png b/assets/images/items/weapon_bow/weapon_bow_1024x1024.png
similarity index 100%
rename from assets/images/items/weapon_bow.png
rename to assets/images/items/weapon_bow/weapon_bow_1024x1024.png
diff --git a/assets/images/items/weapon_bow/weapon_bow_preview_256x256.png b/assets/images/items/weapon_bow/weapon_bow_preview_256x256.png
new file mode 100644
index 000000000..d3e9cb8ad
Binary files /dev/null and b/assets/images/items/weapon_bow/weapon_bow_preview_256x256.png differ
diff --git a/assets/images/items/weapon_bow_sample.png b/assets/images/items/weapon_bow_sample.png
deleted file mode 100644
index e4e8f25ae..000000000
Binary files a/assets/images/items/weapon_bow_sample.png and /dev/null differ
diff --git a/assets/images/items/weapon_bow_wood.png b/assets/images/items/weapon_bow_wood/weapon_bow_wood_1024x1024.png
similarity index 100%
rename from assets/images/items/weapon_bow_wood.png
rename to assets/images/items/weapon_bow_wood/weapon_bow_wood_1024x1024.png
diff --git a/assets/images/items/weapon_bow_wood/weapon_bow_wood_preview_256x256.png b/assets/images/items/weapon_bow_wood/weapon_bow_wood_preview_256x256.png
new file mode 100644
index 000000000..ea7adaf8c
Binary files /dev/null and b/assets/images/items/weapon_bow_wood/weapon_bow_wood_preview_256x256.png differ
diff --git a/assets/images/items/weapon_crossbow.png b/assets/images/items/weapon_crossbow/weapon_crossbow_1024x1024.png
similarity index 100%
rename from assets/images/items/weapon_crossbow.png
rename to assets/images/items/weapon_crossbow/weapon_crossbow_1024x1024.png
diff --git a/assets/images/items/weapon_crossbow/weapon_crossbow_preview_256x256.png b/assets/images/items/weapon_crossbow/weapon_crossbow_preview_256x256.png
new file mode 100644
index 000000000..1cbbfce24
Binary files /dev/null and b/assets/images/items/weapon_crossbow/weapon_crossbow_preview_256x256.png differ
diff --git a/assets/images/items/weapon_spear.png b/assets/images/items/weapon_spear/weapon_spear_1024x1024.png
similarity index 100%
rename from assets/images/items/weapon_spear.png
rename to assets/images/items/weapon_spear/weapon_spear_1024x1024.png
diff --git a/assets/images/items/weapon_spear/weapon_spear_preview_256x256.png b/assets/images/items/weapon_spear/weapon_spear_preview_256x256.png
new file mode 100644
index 000000000..280f44749
Binary files /dev/null and b/assets/images/items/weapon_spear/weapon_spear_preview_256x256.png differ
diff --git a/assets/images/items/weapon_sword_iron.png b/assets/images/items/weapon_sword_iron/weapon_sword_iron_1024x1024.png
similarity index 100%
rename from assets/images/items/weapon_sword_iron.png
rename to assets/images/items/weapon_sword_iron/weapon_sword_iron_1024x1024.png
diff --git a/assets/images/items/weapon_sword_iron/weapon_sword_iron_preview_256x256.png b/assets/images/items/weapon_sword_iron/weapon_sword_iron_preview_256x256.png
new file mode 100644
index 000000000..6b5222130
Binary files /dev/null and b/assets/images/items/weapon_sword_iron/weapon_sword_iron_preview_256x256.png differ
diff --git a/assets/images/items/wheat_bundle.png b/assets/images/items/wheat_bundle/wheat_bundle_1024x1024.png
similarity index 100%
rename from assets/images/items/wheat_bundle.png
rename to assets/images/items/wheat_bundle/wheat_bundle_1024x1024.png
diff --git a/assets/images/items/wheat_bundle/wheat_bundle_preview_256x256.png b/assets/images/items/wheat_bundle/wheat_bundle_preview_256x256.png
new file mode 100644
index 000000000..a617d571f
Binary files /dev/null and b/assets/images/items/wheat_bundle/wheat_bundle_preview_256x256.png differ
diff --git a/assets/images/items/wood_log.png b/assets/images/items/wood_log/wood_log_1024x1024.png
similarity index 100%
rename from assets/images/items/wood_log.png
rename to assets/images/items/wood_log/wood_log_1024x1024.png
diff --git a/assets/images/items/wood_log/wood_log_preview_256x256.png b/assets/images/items/wood_log/wood_log_preview_256x256.png
new file mode 100644
index 000000000..88fd5e046
Binary files /dev/null and b/assets/images/items/wood_log/wood_log_preview_256x256.png differ
diff --git a/assets/images/mutanti/mutant_dog.png b/assets/images/mutanti/mutant_dog/mutant_dog_1024x1024.png
similarity index 100%
rename from assets/images/mutanti/mutant_dog.png
rename to assets/images/mutanti/mutant_dog/mutant_dog_1024x1024.png
diff --git a/assets/images/mutanti/mutant_dog/mutant_dog_preview_256x256.png b/assets/images/mutanti/mutant_dog/mutant_dog_preview_256x256.png
new file mode 100644
index 000000000..0e42aad67
Binary files /dev/null and b/assets/images/mutanti/mutant_dog/mutant_dog_preview_256x256.png differ
diff --git a/assets/images/mutanti/mutant_rat_giant.png b/assets/images/mutanti/mutant_rat_giant/mutant_rat_giant_1024x1024.png
similarity index 100%
rename from assets/images/mutanti/mutant_rat_giant.png
rename to assets/images/mutanti/mutant_rat_giant/mutant_rat_giant_1024x1024.png
diff --git a/assets/images/mutanti/mutant_rat_giant/mutant_rat_giant_preview_256x256.png b/assets/images/mutanti/mutant_rat_giant/mutant_rat_giant_preview_256x256.png
new file mode 100644
index 000000000..ef5839b2a
Binary files /dev/null and b/assets/images/mutanti/mutant_rat_giant/mutant_rat_giant_preview_256x256.png differ
diff --git a/assets/images/mutanti/mutant_spider.png b/assets/images/mutanti/mutant_spider/mutant_spider_1024x1024.png
similarity index 100%
rename from assets/images/mutanti/mutant_spider.png
rename to assets/images/mutanti/mutant_spider/mutant_spider_1024x1024.png
diff --git a/assets/images/mutanti/mutant_spider/mutant_spider_preview_256x256.png b/assets/images/mutanti/mutant_spider/mutant_spider_preview_256x256.png
new file mode 100644
index 000000000..ccaf7a0dd
Binary files /dev/null and b/assets/images/mutanti/mutant_spider/mutant_spider_preview_256x256.png differ
diff --git a/assets/images/mutanti/slime_blue.png b/assets/images/mutanti/slime_blue/slime_blue_1024x1024.png
similarity index 100%
rename from assets/images/mutanti/slime_blue.png
rename to assets/images/mutanti/slime_blue/slime_blue_1024x1024.png
diff --git a/assets/images/mutanti/slime_blue/slime_blue_preview_256x256.png b/assets/images/mutanti/slime_blue/slime_blue_preview_256x256.png
new file mode 100644
index 000000000..b64665843
Binary files /dev/null and b/assets/images/mutanti/slime_blue/slime_blue_preview_256x256.png differ
diff --git a/assets/images/mutanti/slime_green.png b/assets/images/mutanti/slime_green/slime_green_1024x1024.png
similarity index 100%
rename from assets/images/mutanti/slime_green.png
rename to assets/images/mutanti/slime_green/slime_green_1024x1024.png
diff --git a/assets/images/mutanti/slime_green/slime_green_preview_256x256.png b/assets/images/mutanti/slime_green/slime_green_preview_256x256.png
new file mode 100644
index 000000000..4ca1d36b9
Binary files /dev/null and b/assets/images/mutanti/slime_green/slime_green_preview_256x256.png differ
diff --git a/assets/images/mutanti/slime_purple.png b/assets/images/mutanti/slime_purple/slime_purple_1024x1024.png
similarity index 100%
rename from assets/images/mutanti/slime_purple.png
rename to assets/images/mutanti/slime_purple/slime_purple_1024x1024.png
diff --git a/assets/images/mutanti/slime_purple/slime_purple_preview_256x256.png b/assets/images/mutanti/slime_purple/slime_purple_preview_256x256.png
new file mode 100644
index 000000000..81b0c9287
Binary files /dev/null and b/assets/images/mutanti/slime_purple/slime_purple_preview_256x256.png differ
diff --git a/assets/images/mutanti/slime_red.png b/assets/images/mutanti/slime_red/slime_red_1024x1024.png
similarity index 100%
rename from assets/images/mutanti/slime_red.png
rename to assets/images/mutanti/slime_red/slime_red_1024x1024.png
diff --git a/assets/images/mutanti/slime_red/slime_red_preview_256x256.png b/assets/images/mutanti/slime_red/slime_red_preview_256x256.png
new file mode 100644
index 000000000..808fee009
Binary files /dev/null and b/assets/images/mutanti/slime_red/slime_red_preview_256x256.png differ
diff --git a/assets/images/mutanti/zombie_armored.png b/assets/images/mutanti/zombie_armored/zombie_armored_1024x1024.png
similarity index 100%
rename from assets/images/mutanti/zombie_armored.png
rename to assets/images/mutanti/zombie_armored/zombie_armored_1024x1024.png
diff --git a/assets/images/mutanti/zombie_armored/zombie_armored_preview_256x256.png b/assets/images/mutanti/zombie_armored/zombie_armored_preview_256x256.png
new file mode 100644
index 000000000..cf87dd53d
Binary files /dev/null and b/assets/images/mutanti/zombie_armored/zombie_armored_preview_256x256.png differ
diff --git a/assets/images/mutanti/zombie_basic.png b/assets/images/mutanti/zombie_basic/zombie_basic_1024x1024.png
similarity index 100%
rename from assets/images/mutanti/zombie_basic.png
rename to assets/images/mutanti/zombie_basic/zombie_basic_1024x1024.png
diff --git a/assets/images/mutanti/zombie_basic/zombie_basic_preview_256x256.png b/assets/images/mutanti/zombie_basic/zombie_basic_preview_256x256.png
new file mode 100644
index 000000000..dac08efd3
Binary files /dev/null and b/assets/images/mutanti/zombie_basic/zombie_basic_preview_256x256.png differ
diff --git a/assets/images/mutanti/zombie_bloated.png b/assets/images/mutanti/zombie_bloated/zombie_bloated_1024x1024.png
similarity index 100%
rename from assets/images/mutanti/zombie_bloated.png
rename to assets/images/mutanti/zombie_bloated/zombie_bloated_1024x1024.png
diff --git a/assets/images/mutanti/zombie_bloated/zombie_bloated_preview_256x256.png b/assets/images/mutanti/zombie_bloated/zombie_bloated_preview_256x256.png
new file mode 100644
index 000000000..222063d42
Binary files /dev/null and b/assets/images/mutanti/zombie_bloated/zombie_bloated_preview_256x256.png differ
diff --git a/assets/images/mutanti/zombie_crawler.png b/assets/images/mutanti/zombie_crawler/zombie_crawler_1024x1024.png
similarity index 100%
rename from assets/images/mutanti/zombie_crawler.png
rename to assets/images/mutanti/zombie_crawler/zombie_crawler_1024x1024.png
diff --git a/assets/images/mutanti/zombie_crawler/zombie_crawler_preview_256x256.png b/assets/images/mutanti/zombie_crawler/zombie_crawler_preview_256x256.png
new file mode 100644
index 000000000..a2756d796
Binary files /dev/null and b/assets/images/mutanti/zombie_crawler/zombie_crawler_preview_256x256.png differ
diff --git a/assets/images/mutanti/zombie_dreadlocks.png b/assets/images/mutanti/zombie_dreadlocks/zombie_dreadlocks_1024x1024.png
similarity index 100%
rename from assets/images/mutanti/zombie_dreadlocks.png
rename to assets/images/mutanti/zombie_dreadlocks/zombie_dreadlocks_1024x1024.png
diff --git a/assets/images/mutanti/zombie_dreadlocks/zombie_dreadlocks_preview_256x256.png b/assets/images/mutanti/zombie_dreadlocks/zombie_dreadlocks_preview_256x256.png
new file mode 100644
index 000000000..99742235a
Binary files /dev/null and b/assets/images/mutanti/zombie_dreadlocks/zombie_dreadlocks_preview_256x256.png differ
diff --git a/assets/images/mutanti/zombie_runner.png b/assets/images/mutanti/zombie_runner/zombie_runner_1024x1024.png
similarity index 100%
rename from assets/images/mutanti/zombie_runner.png
rename to assets/images/mutanti/zombie_runner/zombie_runner_1024x1024.png
diff --git a/assets/images/mutanti/zombie_runner/zombie_runner_preview_256x256.png b/assets/images/mutanti/zombie_runner/zombie_runner_preview_256x256.png
new file mode 100644
index 000000000..888c2ebbf
Binary files /dev/null and b/assets/images/mutanti/zombie_runner/zombie_runner_preview_256x256.png differ
diff --git a/assets/images/mutanti/zombie_sample.png b/assets/images/mutanti/zombie_sample.png
deleted file mode 100644
index 5959846ed..000000000
Binary files a/assets/images/mutanti/zombie_sample.png and /dev/null differ
diff --git a/assets/images/npcs/ana_explorer.png b/assets/images/npcs/ana_explorer/ana_explorer_1024x1024.png
similarity index 100%
rename from assets/images/npcs/ana_explorer.png
rename to assets/images/npcs/ana_explorer/ana_explorer_1024x1024.png
diff --git a/assets/images/npcs/ana_explorer/ana_explorer_preview_256x256.png b/assets/images/npcs/ana_explorer/ana_explorer_preview_256x256.png
new file mode 100644
index 000000000..a9c97dceb
Binary files /dev/null and b/assets/images/npcs/ana_explorer/ana_explorer_preview_256x256.png differ
diff --git a/assets/images/npcs/ana_front_walk1.png b/assets/images/npcs/ana_front_walk1/ana_front_walk1_1024x1024.png
similarity index 100%
rename from assets/images/npcs/ana_front_walk1.png
rename to assets/images/npcs/ana_front_walk1/ana_front_walk1_1024x1024.png
diff --git a/assets/images/npcs/ana_front_walk1/ana_front_walk1_preview_256x256.png b/assets/images/npcs/ana_front_walk1/ana_front_walk1_preview_256x256.png
new file mode 100644
index 000000000..1e2ab4aff
Binary files /dev/null and b/assets/images/npcs/ana_front_walk1/ana_front_walk1_preview_256x256.png differ
diff --git a/assets/images/npcs/ana_front_walk2.png b/assets/images/npcs/ana_front_walk2/ana_front_walk2_1024x1024.png
similarity index 100%
rename from assets/images/npcs/ana_front_walk2.png
rename to assets/images/npcs/ana_front_walk2/ana_front_walk2_1024x1024.png
diff --git a/assets/images/npcs/ana_front_walk2/ana_front_walk2_preview_256x256.png b/assets/images/npcs/ana_front_walk2/ana_front_walk2_preview_256x256.png
new file mode 100644
index 000000000..1e3e558fe
Binary files /dev/null and b/assets/images/npcs/ana_front_walk2/ana_front_walk2_preview_256x256.png differ
diff --git a/assets/images/npcs/gronk_front_idle.png b/assets/images/npcs/gronk_front_idle/gronk_front_idle_1024x1024.png
similarity index 100%
rename from assets/images/npcs/gronk_front_idle.png
rename to assets/images/npcs/gronk_front_idle/gronk_front_idle_1024x1024.png
diff --git a/assets/images/npcs/gronk_front_idle/gronk_front_idle_preview_256x256.png b/assets/images/npcs/gronk_front_idle/gronk_front_idle_preview_256x256.png
new file mode 100644
index 000000000..415f518ef
Binary files /dev/null and b/assets/images/npcs/gronk_front_idle/gronk_front_idle_preview_256x256.png differ
diff --git a/assets/images/npcs/gronk_front_walk1.png b/assets/images/npcs/gronk_front_walk1/gronk_front_walk1_1024x1024.png
similarity index 100%
rename from assets/images/npcs/gronk_front_walk1.png
rename to assets/images/npcs/gronk_front_walk1/gronk_front_walk1_1024x1024.png
diff --git a/assets/images/npcs/gronk_front_walk1/gronk_front_walk1_preview_256x256.png b/assets/images/npcs/gronk_front_walk1/gronk_front_walk1_preview_256x256.png
new file mode 100644
index 000000000..b4677b7ff
Binary files /dev/null and b/assets/images/npcs/gronk_front_walk1/gronk_front_walk1_preview_256x256.png differ
diff --git a/assets/images/npcs/gronk_troll.png b/assets/images/npcs/gronk_troll/gronk_troll_1024x1024.png
similarity index 100%
rename from assets/images/npcs/gronk_troll.png
rename to assets/images/npcs/gronk_troll/gronk_troll_1024x1024.png
diff --git a/assets/images/npcs/gronk_troll/gronk_troll_preview_256x256.png b/assets/images/npcs/gronk_troll/gronk_troll_preview_256x256.png
new file mode 100644
index 000000000..e1e9b5253
Binary files /dev/null and b/assets/images/npcs/gronk_troll/gronk_troll_preview_256x256.png differ
diff --git a/assets/images/npcs/kai_back_walk1.png b/assets/images/npcs/kai_back_walk1/kai_back_walk1_1024x1024.png
similarity index 100%
rename from assets/images/npcs/kai_back_walk1.png
rename to assets/images/npcs/kai_back_walk1/kai_back_walk1_1024x1024.png
diff --git a/assets/images/npcs/kai_back_walk1/kai_back_walk1_preview_256x256.png b/assets/images/npcs/kai_back_walk1/kai_back_walk1_preview_256x256.png
new file mode 100644
index 000000000..936c86f74
Binary files /dev/null and b/assets/images/npcs/kai_back_walk1/kai_back_walk1_preview_256x256.png differ
diff --git a/assets/images/npcs/kai_survivor.png b/assets/images/npcs/kai_survivor/kai_survivor_1024x1024.png
similarity index 100%
rename from assets/images/npcs/kai_survivor.png
rename to assets/images/npcs/kai_survivor/kai_survivor_1024x1024.png
diff --git a/assets/images/npcs/kai_survivor/kai_survivor_preview_256x256.png b/assets/images/npcs/kai_survivor/kai_survivor_preview_256x256.png
new file mode 100644
index 000000000..f8e636bc4
Binary files /dev/null and b/assets/images/npcs/kai_survivor/kai_survivor_preview_256x256.png differ
diff --git a/assets/images/npcs/npc_blacksmith.png b/assets/images/npcs/npc_blacksmith/npc_blacksmith_1024x1024.png
similarity index 100%
rename from assets/images/npcs/npc_blacksmith.png
rename to assets/images/npcs/npc_blacksmith/npc_blacksmith_1024x1024.png
diff --git a/assets/images/npcs/npc_blacksmith/npc_blacksmith_preview_256x256.png b/assets/images/npcs/npc_blacksmith/npc_blacksmith_preview_256x256.png
new file mode 100644
index 000000000..e71ecbed8
Binary files /dev/null and b/assets/images/npcs/npc_blacksmith/npc_blacksmith_preview_256x256.png differ
diff --git a/assets/images/npcs/npc_child.png b/assets/images/npcs/npc_child/npc_child_1024x1024.png
similarity index 100%
rename from assets/images/npcs/npc_child.png
rename to assets/images/npcs/npc_child/npc_child_1024x1024.png
diff --git a/assets/images/npcs/npc_child/npc_child_preview_256x256.png b/assets/images/npcs/npc_child/npc_child_preview_256x256.png
new file mode 100644
index 000000000..1e8736c1e
Binary files /dev/null and b/assets/images/npcs/npc_child/npc_child_preview_256x256.png differ
diff --git a/assets/images/npcs/npc_cook.png b/assets/images/npcs/npc_cook/npc_cook_1024x1024.png
similarity index 100%
rename from assets/images/npcs/npc_cook.png
rename to assets/images/npcs/npc_cook/npc_cook_1024x1024.png
diff --git a/assets/images/npcs/npc_cook/npc_cook_preview_256x256.png b/assets/images/npcs/npc_cook/npc_cook_preview_256x256.png
new file mode 100644
index 000000000..7bf8fdf6f
Binary files /dev/null and b/assets/images/npcs/npc_cook/npc_cook_preview_256x256.png differ
diff --git a/assets/images/npcs/npc_elder.png b/assets/images/npcs/npc_elder/npc_elder_1024x1024.png
similarity index 100%
rename from assets/images/npcs/npc_elder.png
rename to assets/images/npcs/npc_elder/npc_elder_1024x1024.png
diff --git a/assets/images/npcs/npc_elder/npc_elder_preview_256x256.png b/assets/images/npcs/npc_elder/npc_elder_preview_256x256.png
new file mode 100644
index 000000000..e7bd1f071
Binary files /dev/null and b/assets/images/npcs/npc_elder/npc_elder_preview_256x256.png differ
diff --git a/assets/images/npcs/npc_farmer.png b/assets/images/npcs/npc_farmer/npc_farmer_1024x1024.png
similarity index 100%
rename from assets/images/npcs/npc_farmer.png
rename to assets/images/npcs/npc_farmer/npc_farmer_1024x1024.png
diff --git a/assets/images/npcs/npc_farmer/npc_farmer_preview_256x256.png b/assets/images/npcs/npc_farmer/npc_farmer_preview_256x256.png
new file mode 100644
index 000000000..5c4a94b3e
Binary files /dev/null and b/assets/images/npcs/npc_farmer/npc_farmer_preview_256x256.png differ
diff --git a/assets/images/npcs/npc_healer.png b/assets/images/npcs/npc_healer/npc_healer_1024x1024.png
similarity index 100%
rename from assets/images/npcs/npc_healer.png
rename to assets/images/npcs/npc_healer/npc_healer_1024x1024.png
diff --git a/assets/images/npcs/npc_healer/npc_healer_preview_256x256.png b/assets/images/npcs/npc_healer/npc_healer_preview_256x256.png
new file mode 100644
index 000000000..c2a30cc1b
Binary files /dev/null and b/assets/images/npcs/npc_healer/npc_healer_preview_256x256.png differ
diff --git a/assets/images/npcs/npc_hunter.png b/assets/images/npcs/npc_hunter/npc_hunter_1024x1024.png
similarity index 100%
rename from assets/images/npcs/npc_hunter.png
rename to assets/images/npcs/npc_hunter/npc_hunter_1024x1024.png
diff --git a/assets/images/npcs/npc_hunter/npc_hunter_preview_256x256.png b/assets/images/npcs/npc_hunter/npc_hunter_preview_256x256.png
new file mode 100644
index 000000000..0a6d7f451
Binary files /dev/null and b/assets/images/npcs/npc_hunter/npc_hunter_preview_256x256.png differ
diff --git a/assets/images/npcs/npc_mechanic.png b/assets/images/npcs/npc_mechanic/npc_mechanic_1024x1024.png
similarity index 100%
rename from assets/images/npcs/npc_mechanic.png
rename to assets/images/npcs/npc_mechanic/npc_mechanic_1024x1024.png
diff --git a/assets/images/npcs/npc_mechanic/npc_mechanic_preview_256x256.png b/assets/images/npcs/npc_mechanic/npc_mechanic_preview_256x256.png
new file mode 100644
index 000000000..115d13e8b
Binary files /dev/null and b/assets/images/npcs/npc_mechanic/npc_mechanic_preview_256x256.png differ
diff --git a/assets/images/npcs/npc_medic.png b/assets/images/npcs/npc_medic/npc_medic_1024x1024.png
similarity index 100%
rename from assets/images/npcs/npc_medic.png
rename to assets/images/npcs/npc_medic/npc_medic_1024x1024.png
diff --git a/assets/images/npcs/npc_medic/npc_medic_preview_256x256.png b/assets/images/npcs/npc_medic/npc_medic_preview_256x256.png
new file mode 100644
index 000000000..d0fe5a6cd
Binary files /dev/null and b/assets/images/npcs/npc_medic/npc_medic_preview_256x256.png differ
diff --git a/assets/images/npcs/npc_scout.png b/assets/images/npcs/npc_scout/npc_scout_1024x1024.png
similarity index 100%
rename from assets/images/npcs/npc_scout.png
rename to assets/images/npcs/npc_scout/npc_scout_1024x1024.png
diff --git a/assets/images/npcs/npc_scout/npc_scout_preview_256x256.png b/assets/images/npcs/npc_scout/npc_scout_preview_256x256.png
new file mode 100644
index 000000000..fe8ea570a
Binary files /dev/null and b/assets/images/npcs/npc_scout/npc_scout_preview_256x256.png differ
diff --git a/assets/images/npcs/npc_soldier.png b/assets/images/npcs/npc_soldier/npc_soldier_1024x1024.png
similarity index 100%
rename from assets/images/npcs/npc_soldier.png
rename to assets/images/npcs/npc_soldier/npc_soldier_1024x1024.png
diff --git a/assets/images/npcs/npc_soldier/npc_soldier_preview_256x256.png b/assets/images/npcs/npc_soldier/npc_soldier_preview_256x256.png
new file mode 100644
index 000000000..f5e5fb6f4
Binary files /dev/null and b/assets/images/npcs/npc_soldier/npc_soldier_preview_256x256.png differ
diff --git a/assets/images/npcs/npc_trader.png b/assets/images/npcs/npc_trader/npc_trader_1024x1024.png
similarity index 100%
rename from assets/images/npcs/npc_trader.png
rename to assets/images/npcs/npc_trader/npc_trader_1024x1024.png
diff --git a/assets/images/npcs/npc_trader/npc_trader_preview_256x256.png b/assets/images/npcs/npc_trader/npc_trader_preview_256x256.png
new file mode 100644
index 000000000..e09153cea
Binary files /dev/null and b/assets/images/npcs/npc_trader/npc_trader_preview_256x256.png differ
diff --git a/assets/images/ui/health_bar_sample.png b/assets/images/ui/health_bar_sample.png
deleted file mode 100644
index 4ed16b9a9..000000000
Binary files a/assets/images/ui/health_bar_sample.png and /dev/null differ
diff --git a/assets/images/ui/ui_button_menu.png b/assets/images/ui/ui_button_menu/ui_button_menu_1024x1024.png
similarity index 100%
rename from assets/images/ui/ui_button_menu.png
rename to assets/images/ui/ui_button_menu/ui_button_menu_1024x1024.png
diff --git a/assets/images/ui/ui_button_menu/ui_button_menu_preview_256x256.png b/assets/images/ui/ui_button_menu/ui_button_menu_preview_256x256.png
new file mode 100644
index 000000000..e2d9d91d6
Binary files /dev/null and b/assets/images/ui/ui_button_menu/ui_button_menu_preview_256x256.png differ
diff --git a/assets/images/ui/ui_coin_gold.png b/assets/images/ui/ui_coin_gold/ui_coin_gold_1024x1024.png
similarity index 100%
rename from assets/images/ui/ui_coin_gold.png
rename to assets/images/ui/ui_coin_gold/ui_coin_gold_1024x1024.png
diff --git a/assets/images/ui/ui_coin_gold/ui_coin_gold_preview_256x256.png b/assets/images/ui/ui_coin_gold/ui_coin_gold_preview_256x256.png
new file mode 100644
index 000000000..082296390
Binary files /dev/null and b/assets/images/ui/ui_coin_gold/ui_coin_gold_preview_256x256.png differ
diff --git a/assets/images/ui/ui_cursor_hand.png b/assets/images/ui/ui_cursor_hand/ui_cursor_hand_1024x1024.png
similarity index 100%
rename from assets/images/ui/ui_cursor_hand.png
rename to assets/images/ui/ui_cursor_hand/ui_cursor_hand_1024x1024.png
diff --git a/assets/images/ui/ui_cursor_hand/ui_cursor_hand_preview_256x256.png b/assets/images/ui/ui_cursor_hand/ui_cursor_hand_preview_256x256.png
new file mode 100644
index 000000000..f9c0df4b4
Binary files /dev/null and b/assets/images/ui/ui_cursor_hand/ui_cursor_hand_preview_256x256.png differ
diff --git a/assets/images/ui/ui_energy_bar.png b/assets/images/ui/ui_energy_bar/ui_energy_bar_1024x1024.png
similarity index 100%
rename from assets/images/ui/ui_energy_bar.png
rename to assets/images/ui/ui_energy_bar/ui_energy_bar_1024x1024.png
diff --git a/assets/images/ui/ui_energy_bar/ui_energy_bar_preview_256x256.png b/assets/images/ui/ui_energy_bar/ui_energy_bar_preview_256x256.png
new file mode 100644
index 000000000..c973137d9
Binary files /dev/null and b/assets/images/ui/ui_energy_bar/ui_energy_bar_preview_256x256.png differ
diff --git a/assets/images/ui/ui_gem_blue.png b/assets/images/ui/ui_gem_blue/ui_gem_blue_1024x1024.png
similarity index 100%
rename from assets/images/ui/ui_gem_blue.png
rename to assets/images/ui/ui_gem_blue/ui_gem_blue_1024x1024.png
diff --git a/assets/images/ui/ui_gem_blue/ui_gem_blue_preview_256x256.png b/assets/images/ui/ui_gem_blue/ui_gem_blue_preview_256x256.png
new file mode 100644
index 000000000..b8e7c18f3
Binary files /dev/null and b/assets/images/ui/ui_gem_blue/ui_gem_blue_preview_256x256.png differ
diff --git a/assets/images/ui/ui_health_bar.png b/assets/images/ui/ui_health_bar/ui_health_bar_1024x1024.png
similarity index 100%
rename from assets/images/ui/ui_health_bar.png
rename to assets/images/ui/ui_health_bar/ui_health_bar_1024x1024.png
diff --git a/assets/images/ui/ui_health_bar/ui_health_bar_preview_256x256.png b/assets/images/ui/ui_health_bar/ui_health_bar_preview_256x256.png
new file mode 100644
index 000000000..5e3f04e44
Binary files /dev/null and b/assets/images/ui/ui_health_bar/ui_health_bar_preview_256x256.png differ
diff --git a/assets/images/ui/ui_heart_empty.png b/assets/images/ui/ui_heart_empty/ui_heart_empty_1024x1024.png
similarity index 100%
rename from assets/images/ui/ui_heart_empty.png
rename to assets/images/ui/ui_heart_empty/ui_heart_empty_1024x1024.png
diff --git a/assets/images/ui/ui_heart_empty/ui_heart_empty_preview_256x256.png b/assets/images/ui/ui_heart_empty/ui_heart_empty_preview_256x256.png
new file mode 100644
index 000000000..fac3eddec
Binary files /dev/null and b/assets/images/ui/ui_heart_empty/ui_heart_empty_preview_256x256.png differ
diff --git a/assets/images/ui/ui_heart_full.png b/assets/images/ui/ui_heart_full/ui_heart_full_1024x1024.png
similarity index 100%
rename from assets/images/ui/ui_heart_full.png
rename to assets/images/ui/ui_heart_full/ui_heart_full_1024x1024.png
diff --git a/assets/images/ui/ui_heart_full/ui_heart_full_preview_256x256.png b/assets/images/ui/ui_heart_full/ui_heart_full_preview_256x256.png
new file mode 100644
index 000000000..524d0d66f
Binary files /dev/null and b/assets/images/ui/ui_heart_full/ui_heart_full_preview_256x256.png differ
diff --git a/assets/images/ui/ui_icon_gold.png b/assets/images/ui/ui_icon_gold/ui_icon_gold_1024x1024.png
similarity index 100%
rename from assets/images/ui/ui_icon_gold.png
rename to assets/images/ui/ui_icon_gold/ui_icon_gold_1024x1024.png
diff --git a/assets/images/ui/ui_icon_gold/ui_icon_gold_preview_256x256.png b/assets/images/ui/ui_icon_gold/ui_icon_gold_preview_256x256.png
new file mode 100644
index 000000000..d804dec52
Binary files /dev/null and b/assets/images/ui/ui_icon_gold/ui_icon_gold_preview_256x256.png differ
diff --git a/assets/images/ui/ui_inventory_slot.png b/assets/images/ui/ui_inventory_slot/ui_inventory_slot_1024x1024.png
similarity index 100%
rename from assets/images/ui/ui_inventory_slot.png
rename to assets/images/ui/ui_inventory_slot/ui_inventory_slot_1024x1024.png
diff --git a/assets/images/ui/ui_inventory_slot/ui_inventory_slot_preview_256x256.png b/assets/images/ui/ui_inventory_slot/ui_inventory_slot_preview_256x256.png
new file mode 100644
index 000000000..c64b860f7
Binary files /dev/null and b/assets/images/ui/ui_inventory_slot/ui_inventory_slot_preview_256x256.png differ
diff --git a/assets/images/ui/ui_key_gold.png b/assets/images/ui/ui_key_gold/ui_key_gold_1024x1024.png
similarity index 100%
rename from assets/images/ui/ui_key_gold.png
rename to assets/images/ui/ui_key_gold/ui_key_gold_1024x1024.png
diff --git a/assets/images/ui/ui_key_gold/ui_key_gold_preview_256x256.png b/assets/images/ui/ui_key_gold/ui_key_gold_preview_256x256.png
new file mode 100644
index 000000000..422472a24
Binary files /dev/null and b/assets/images/ui/ui_key_gold/ui_key_gold_preview_256x256.png differ
diff --git a/assets/images/ui/ui_star.png b/assets/images/ui/ui_star/ui_star_1024x1024.png
similarity index 100%
rename from assets/images/ui/ui_star.png
rename to assets/images/ui/ui_star/ui_star_1024x1024.png
diff --git a/assets/images/ui/ui_star/ui_star_preview_256x256.png b/assets/images/ui/ui_star/ui_star_preview_256x256.png
new file mode 100644
index 000000000..178dca4e6
Binary files /dev/null and b/assets/images/ui/ui_star/ui_star_preview_256x256.png differ
diff --git a/assets/images/workstations/campfire.png b/assets/images/workstations/campfire/campfire_1024x1024.png
similarity index 100%
rename from assets/images/workstations/campfire.png
rename to assets/images/workstations/campfire/campfire_1024x1024.png
diff --git a/assets/images/workstations/campfire/campfire_preview_256x256.png b/assets/images/workstations/campfire/campfire_preview_256x256.png
new file mode 100644
index 000000000..d330009e0
Binary files /dev/null and b/assets/images/workstations/campfire/campfire_preview_256x256.png differ
diff --git a/assets/images/zivali/bear_brown.png b/assets/images/zivali/bear_brown/bear_brown_1024x1024.png
similarity index 100%
rename from assets/images/zivali/bear_brown.png
rename to assets/images/zivali/bear_brown/bear_brown_1024x1024.png
diff --git a/assets/images/zivali/bear_brown/bear_brown_preview_256x256.png b/assets/images/zivali/bear_brown/bear_brown_preview_256x256.png
new file mode 100644
index 000000000..922a79d31
Binary files /dev/null and b/assets/images/zivali/bear_brown/bear_brown_preview_256x256.png differ
diff --git a/assets/images/zivali/cat_tabby.png b/assets/images/zivali/cat_tabby/cat_tabby_1024x1024.png
similarity index 100%
rename from assets/images/zivali/cat_tabby.png
rename to assets/images/zivali/cat_tabby/cat_tabby_1024x1024.png
diff --git a/assets/images/zivali/cat_tabby/cat_tabby_preview_256x256.png b/assets/images/zivali/cat_tabby/cat_tabby_preview_256x256.png
new file mode 100644
index 000000000..ba9f86a4d
Binary files /dev/null and b/assets/images/zivali/cat_tabby/cat_tabby_preview_256x256.png differ
diff --git a/assets/images/zivali/chicken_white.png b/assets/images/zivali/chicken_white/chicken_white_1024x1024.png
similarity index 100%
rename from assets/images/zivali/chicken_white.png
rename to assets/images/zivali/chicken_white/chicken_white_1024x1024.png
diff --git a/assets/images/zivali/chicken_white/chicken_white_preview_256x256.png b/assets/images/zivali/chicken_white/chicken_white_preview_256x256.png
new file mode 100644
index 000000000..ae9ba5fe2
Binary files /dev/null and b/assets/images/zivali/chicken_white/chicken_white_preview_256x256.png differ
diff --git a/assets/images/zivali/cow_spotted.png b/assets/images/zivali/cow_spotted/cow_spotted_1024x1024.png
similarity index 100%
rename from assets/images/zivali/cow_spotted.png
rename to assets/images/zivali/cow_spotted/cow_spotted_1024x1024.png
diff --git a/assets/images/zivali/cow_spotted/cow_spotted_preview_256x256.png b/assets/images/zivali/cow_spotted/cow_spotted_preview_256x256.png
new file mode 100644
index 000000000..99cf5043f
Binary files /dev/null and b/assets/images/zivali/cow_spotted/cow_spotted_preview_256x256.png differ
diff --git a/assets/images/zivali/deer_forest.png b/assets/images/zivali/deer_forest/deer_forest_1024x1024.png
similarity index 100%
rename from assets/images/zivali/deer_forest.png
rename to assets/images/zivali/deer_forest/deer_forest_1024x1024.png
diff --git a/assets/images/zivali/deer_forest/deer_forest_preview_256x256.png b/assets/images/zivali/deer_forest/deer_forest_preview_256x256.png
new file mode 100644
index 000000000..1f85ed94c
Binary files /dev/null and b/assets/images/zivali/deer_forest/deer_forest_preview_256x256.png differ
diff --git a/assets/images/zivali/dog_husky.png b/assets/images/zivali/dog_husky/dog_husky_1024x1024.png
similarity index 100%
rename from assets/images/zivali/dog_husky.png
rename to assets/images/zivali/dog_husky/dog_husky_1024x1024.png
diff --git a/assets/images/zivali/dog_husky/dog_husky_preview_256x256.png b/assets/images/zivali/dog_husky/dog_husky_preview_256x256.png
new file mode 100644
index 000000000..bbb90ce95
Binary files /dev/null and b/assets/images/zivali/dog_husky/dog_husky_preview_256x256.png differ
diff --git a/assets/images/zivali/fire_sheep.png b/assets/images/zivali/fire_sheep/fire_sheep_1024x1024.png
similarity index 100%
rename from assets/images/zivali/fire_sheep.png
rename to assets/images/zivali/fire_sheep/fire_sheep_1024x1024.png
diff --git a/assets/images/zivali/fire_sheep/fire_sheep_preview_256x256.png b/assets/images/zivali/fire_sheep/fire_sheep_preview_256x256.png
new file mode 100644
index 000000000..4e9310749
Binary files /dev/null and b/assets/images/zivali/fire_sheep/fire_sheep_preview_256x256.png differ
diff --git a/assets/images/zivali/fox_red.png b/assets/images/zivali/fox_red/fox_red_1024x1024.png
similarity index 100%
rename from assets/images/zivali/fox_red.png
rename to assets/images/zivali/fox_red/fox_red_1024x1024.png
diff --git a/assets/images/zivali/fox_red/fox_red_preview_256x256.png b/assets/images/zivali/fox_red/fox_red_preview_256x256.png
new file mode 100644
index 000000000..13bbb95ae
Binary files /dev/null and b/assets/images/zivali/fox_red/fox_red_preview_256x256.png differ
diff --git a/assets/images/zivali/goat_brown.png b/assets/images/zivali/goat_brown/goat_brown_1024x1024.png
similarity index 100%
rename from assets/images/zivali/goat_brown.png
rename to assets/images/zivali/goat_brown/goat_brown_1024x1024.png
diff --git a/assets/images/zivali/goat_brown/goat_brown_preview_256x256.png b/assets/images/zivali/goat_brown/goat_brown_preview_256x256.png
new file mode 100644
index 000000000..559e42c18
Binary files /dev/null and b/assets/images/zivali/goat_brown/goat_brown_preview_256x256.png differ
diff --git a/assets/images/zivali/golden_goose.png b/assets/images/zivali/golden_goose/golden_goose_1024x1024.png
similarity index 100%
rename from assets/images/zivali/golden_goose.png
rename to assets/images/zivali/golden_goose/golden_goose_1024x1024.png
diff --git a/assets/images/zivali/golden_goose/golden_goose_preview_256x256.png b/assets/images/zivali/golden_goose/golden_goose_preview_256x256.png
new file mode 100644
index 000000000..fe8a6360c
Binary files /dev/null and b/assets/images/zivali/golden_goose/golden_goose_preview_256x256.png differ
diff --git a/assets/images/zivali/horse_brown.png b/assets/images/zivali/horse_brown/horse_brown_1024x1024.png
similarity index 100%
rename from assets/images/zivali/horse_brown.png
rename to assets/images/zivali/horse_brown/horse_brown_1024x1024.png
diff --git a/assets/images/zivali/horse_brown/horse_brown_preview_256x256.png b/assets/images/zivali/horse_brown/horse_brown_preview_256x256.png
new file mode 100644
index 000000000..f059f9f51
Binary files /dev/null and b/assets/images/zivali/horse_brown/horse_brown_preview_256x256.png differ
diff --git a/assets/images/zivali/legendary_crystal_turtle.png b/assets/images/zivali/legendary_crystal_turtle/legendary_crystal_turtle_1024x1024.png
similarity index 100%
rename from assets/images/zivali/legendary_crystal_turtle.png
rename to assets/images/zivali/legendary_crystal_turtle/legendary_crystal_turtle_1024x1024.png
diff --git a/assets/images/zivali/legendary_crystal_turtle/legendary_crystal_turtle_preview_256x256.png b/assets/images/zivali/legendary_crystal_turtle/legendary_crystal_turtle_preview_256x256.png
new file mode 100644
index 000000000..522a92242
Binary files /dev/null and b/assets/images/zivali/legendary_crystal_turtle/legendary_crystal_turtle_preview_256x256.png differ
diff --git a/assets/images/zivali/legendary_giant_bee.png b/assets/images/zivali/legendary_giant_bee/legendary_giant_bee_1024x1024.png
similarity index 100%
rename from assets/images/zivali/legendary_giant_bee.png
rename to assets/images/zivali/legendary_giant_bee/legendary_giant_bee_1024x1024.png
diff --git a/assets/images/zivali/legendary_giant_bee/legendary_giant_bee_preview_256x256.png b/assets/images/zivali/legendary_giant_bee/legendary_giant_bee_preview_256x256.png
new file mode 100644
index 000000000..77b9a36a4
Binary files /dev/null and b/assets/images/zivali/legendary_giant_bee/legendary_giant_bee_preview_256x256.png differ
diff --git a/assets/images/zivali/legendary_silver_stag.png b/assets/images/zivali/legendary_silver_stag/legendary_silver_stag_1024x1024.png
similarity index 100%
rename from assets/images/zivali/legendary_silver_stag.png
rename to assets/images/zivali/legendary_silver_stag/legendary_silver_stag_1024x1024.png
diff --git a/assets/images/zivali/legendary_silver_stag/legendary_silver_stag_preview_256x256.png b/assets/images/zivali/legendary_silver_stag/legendary_silver_stag_preview_256x256.png
new file mode 100644
index 000000000..469123ac4
Binary files /dev/null and b/assets/images/zivali/legendary_silver_stag/legendary_silver_stag_preview_256x256.png differ
diff --git a/assets/images/zivali/phoenix_chicken.png b/assets/images/zivali/phoenix_chicken/phoenix_chicken_1024x1024.png
similarity index 100%
rename from assets/images/zivali/phoenix_chicken.png
rename to assets/images/zivali/phoenix_chicken/phoenix_chicken_1024x1024.png
diff --git a/assets/images/zivali/phoenix_chicken/phoenix_chicken_preview_256x256.png b/assets/images/zivali/phoenix_chicken/phoenix_chicken_preview_256x256.png
new file mode 100644
index 000000000..5552884a6
Binary files /dev/null and b/assets/images/zivali/phoenix_chicken/phoenix_chicken_preview_256x256.png differ
diff --git a/assets/images/zivali/pig_pink.png b/assets/images/zivali/pig_pink/pig_pink_1024x1024.png
similarity index 100%
rename from assets/images/zivali/pig_pink.png
rename to assets/images/zivali/pig_pink/pig_pink_1024x1024.png
diff --git a/assets/images/zivali/pig_pink/pig_pink_preview_256x256.png b/assets/images/zivali/pig_pink/pig_pink_preview_256x256.png
new file mode 100644
index 000000000..2c0c9770e
Binary files /dev/null and b/assets/images/zivali/pig_pink/pig_pink_preview_256x256.png differ
diff --git a/assets/images/zivali/rabbit_white.png b/assets/images/zivali/rabbit_white/rabbit_white_1024x1024.png
similarity index 100%
rename from assets/images/zivali/rabbit_white.png
rename to assets/images/zivali/rabbit_white/rabbit_white_1024x1024.png
diff --git a/assets/images/zivali/rabbit_white/rabbit_white_preview_256x256.png b/assets/images/zivali/rabbit_white/rabbit_white_preview_256x256.png
new file mode 100644
index 000000000..abc79a06b
Binary files /dev/null and b/assets/images/zivali/rabbit_white/rabbit_white_preview_256x256.png differ
diff --git a/assets/images/zivali/sheep_fluffy.png b/assets/images/zivali/sheep_fluffy/sheep_fluffy_1024x1024.png
similarity index 100%
rename from assets/images/zivali/sheep_fluffy.png
rename to assets/images/zivali/sheep_fluffy/sheep_fluffy_1024x1024.png
diff --git a/assets/images/zivali/sheep_fluffy/sheep_fluffy_preview_256x256.png b/assets/images/zivali/sheep_fluffy/sheep_fluffy_preview_256x256.png
new file mode 100644
index 000000000..51e507eee
Binary files /dev/null and b/assets/images/zivali/sheep_fluffy/sheep_fluffy_preview_256x256.png differ
diff --git a/assets/images/zivali/sheep_sample.png b/assets/images/zivali/sheep_sample.png
deleted file mode 100644
index 0d2275f24..000000000
Binary files a/assets/images/zivali/sheep_sample.png and /dev/null differ
diff --git a/assets/images/zivali/susi_dachshund.png b/assets/images/zivali/susi_dachshund/susi_dachshund_1024x1024.png
similarity index 100%
rename from assets/images/zivali/susi_dachshund.png
rename to assets/images/zivali/susi_dachshund/susi_dachshund_1024x1024.png
diff --git a/assets/images/zivali/susi_dachshund/susi_dachshund_preview_256x256.png b/assets/images/zivali/susi_dachshund/susi_dachshund_preview_256x256.png
new file mode 100644
index 000000000..bcbafe203
Binary files /dev/null and b/assets/images/zivali/susi_dachshund/susi_dachshund_preview_256x256.png differ
diff --git a/assets/images/zivali/test_cow.png b/assets/images/zivali/test_cow.png
deleted file mode 100644
index 1837f7244..000000000
Binary files a/assets/images/zivali/test_cow.png and /dev/null differ
diff --git a/assets/images/zivali/test_cow_stardew.png b/assets/images/zivali/test_cow_stardew.png
deleted file mode 100644
index 0afc1671e..000000000
Binary files a/assets/images/zivali/test_cow_stardew.png and /dev/null differ
diff --git a/assets/images/zivali/test_cow_v2.png b/assets/images/zivali/test_cow_v2.png
deleted file mode 100644
index 5285cfa37..000000000
Binary files a/assets/images/zivali/test_cow_v2.png and /dev/null differ
diff --git a/assets/images/zivali/unicorn.png b/assets/images/zivali/unicorn/unicorn_1024x1024.png
similarity index 100%
rename from assets/images/zivali/unicorn.png
rename to assets/images/zivali/unicorn/unicorn_1024x1024.png
diff --git a/assets/images/zivali/unicorn/unicorn_preview_256x256.png b/assets/images/zivali/unicorn/unicorn_preview_256x256.png
new file mode 100644
index 000000000..4cdb868a8
Binary files /dev/null and b/assets/images/zivali/unicorn/unicorn_preview_256x256.png differ
diff --git a/assets/images/zivali/wolf_grey.png b/assets/images/zivali/wolf_grey/wolf_grey_1024x1024.png
similarity index 100%
rename from assets/images/zivali/wolf_grey.png
rename to assets/images/zivali/wolf_grey/wolf_grey_1024x1024.png
diff --git a/assets/images/zivali/wolf_grey/wolf_grey_preview_256x256.png b/assets/images/zivali/wolf_grey/wolf_grey_preview_256x256.png
new file mode 100644
index 000000000..72e248eeb
Binary files /dev/null and b/assets/images/zivali/wolf_grey/wolf_grey_preview_256x256.png differ
diff --git a/scripts/organize_all_assets.py b/scripts/organize_all_assets.py
new file mode 100644
index 000000000..86c4e6a47
--- /dev/null
+++ b/scripts/organize_all_assets.py
@@ -0,0 +1,250 @@
+#!/usr/bin/env python3
+"""
+Complete asset organization for ALL asset directories:
+1. Remove sample/test/placeholder files
+2. Add 256x256 preview versions
+3. Organize into subfolders with proper naming
+
+Works on ALL directories in assets/images/
+"""
+
+import os
+import shutil
+from pathlib import Path
+from PIL import Image
+from collections import defaultdict
+
+# Files to delete (junk/samples/tests)
+DELETE_PATTERNS = [
+    '*sample*', '*test*', '*placeholder*', '*_old*', 
+    '*temp*', '*backup*', '*copy*', '*duplicate*'
+]
+
+def should_delete(filename: str) -> bool:
+    """Check if file should be deleted"""
+    lower = filename.lower()
+    patterns = ['sample', 'test', 'placeholder', '_old', 'temp', 'backup', 'copy', 'duplicate']
+    return any(p in lower for p in patterns)
+
+def is_valid_image(filepath: Path) -> bool:
+    """Check if image is valid (not corrupted, not too small)"""
+    try:
+        img = Image.open(filepath)
+        width, height = img.size
+        # Too small = probably junk
+        if width < 16 or height < 16:
+            return False
+        # Check if image can be loaded
+        img.verify()
+        return True
+    except:
+        return False
+
+def clean_junk_files(directory: Path, dry_run: bool = False):
+    """Remove sample/test/junk files"""
+    
+    deleted = []
+    
+    for png_file in directory.rglob('*.png'):
+        if should_delete(png_file.name):
+            deleted.append(png_file.name)
+            if not dry_run:
+                png_file.unlink()
+                print(f"  🗑️  Deleted junk: {png_file.name}")
+        elif not is_valid_image(png_file):
+            deleted.append(png_file.name)
+            if not dry_run:
+                png_file.unlink()
+                print(f"  🗑️  Deleted invalid: {png_file.name}")
+    
+    return deleted
+
+def add_preview_version(asset_path: Path, dry_run: bool = False):
+    """Add 256x256 preview if missing"""
+    
+    # Skip if already a preview/sprite
+    if 'preview' in asset_path.stem or 'sprite' in asset_path.stem:
+        return False
+    
+    # Skip tiny files
+    if any(size in asset_path.stem for size in ['32x32', '16x16', '24x24', '32x64']):
+        return False
+    
+    try:
+        # Create preview filename
+        preview_filename = f"{asset_path.stem}_preview_256x256.png"
+        preview_path = asset_path.parent / preview_filename
+        
+        # Skip if exists
+        if preview_path.exists():
+            return False
+        
+        # Load and resize
+        img = Image.open(asset_path)
+        preview = img.resize((256, 256), Image.Resampling.LANCZOS)
+        
+        if not dry_run:
+            preview.save(preview_path, 'PNG', optimize=True)
+            print(f"    ✅ Created preview: {preview_filename}")
+        
+        return True
+        
+    except Exception as e:
+        print(f"    ❌ Error creating preview for {asset_path.name}: {e}")
+        return False
+
+def get_base_asset_name(filename: str) -> str:
+    """Extract base asset name"""
+    stem = filename.replace('.png', '')
+    
+    # Remove style suffix
+    if '_styleA' in stem:
+        stem = stem.split('_styleA')[0]
+    elif '_styleB' in stem:
+        stem = stem.split('_styleB')[0]
+    
+    # Remove size suffix
+    for size in ['_1024x1024', '_256x256', '_32x32', '_16x16', '_32x64', '_24x24']:
+        stem = stem.replace(size, '')
+    
+    # Remove type suffix
+    for suffix in ['_preview', '_sprite']:
+        stem = stem.replace(suffix, '')
+    
+    return stem
+
+def organize_directory(directory: Path, dry_run: bool = False):
+    """
+    Organize single directory:
+    1. Clean junk files
+    2. Add preview versions
+    3. Organize into subfolders
+    """
+    
+    if not directory.exists() or not directory.is_dir():
+        return 0
+    
+    print(f"\n{'='*70}")
+    print(f"📂 ORGANIZING: {directory.relative_to('assets/images')}")
+    print(f"{'='*70}")
+    
+    # Step 1: Clean junk
+    deleted = clean_junk_files(directory, dry_run)
+    if deleted:
+        print(f"  🗑️  Cleaned {len(deleted)} junk files")
+    
+    # Step 2: Add preview versions
+    preview_count = 0
+    for png_file in directory.glob('*.png'):
+        if png_file.is_file():
+            if add_preview_version(png_file, dry_run):
+                preview_count += 1
+    
+    if preview_count > 0:
+        print(f"  🖼️  Created {preview_count} preview versions")
+    
+    # Step 3: Delete 'originals/' folder if exists
+    originals_path = directory / 'originals'
+    if originals_path.exists():
+        if not dry_run:
+            shutil.rmtree(originals_path)
+        print(f"  🗑️  Deleted duplicate folder: originals/")
+    
+    # Step 4: Group files by base asset name
+    asset_groups = defaultdict(list)
+    
+    for png_file in directory.glob('*.png'):
+        if png_file.is_file():
+            base_name = get_base_asset_name(png_file.name)
+            asset_groups[base_name].append(png_file)
+    
+    if not asset_groups:
+        print("  ✓ No assets to organize (already done or empty)")
+        return 0
+    
+    # Step 5: Organize into subfolders
+    organized = 0
+    for asset_name, files in sorted(asset_groups.items()):
+        # Organize if there's original + preview, or multiple related files
+        has_preview = any('preview' in f.stem for f in files)
+        has_sprite = any(any(s in f.stem for s in ['32x32', '16x16']) for f in files)
+        
+        # Only organize if we have multiple versions (original + preview/sprite)
+        if len(files) < 2 and not (has_preview or has_sprite):
+            continue
+        
+        asset_folder = directory / asset_name
+        
+        if not dry_run:
+            asset_folder.mkdir(exist_ok=True)
+        
+        print(f"\n  📁 {asset_name}/ ({len(files)} files)")
+        
+        for file_path in files:
+            # Determine new filename
+            if 'preview' in file_path.stem:
+                new_name = f"{asset_name}_preview_256x256.png"
+            elif any(s in file_path.stem for s in ['32x32', '16x16', '32x64', '24x24']):
+                # Extract size
+                for s in ['32x32', '16x16', '32x64', '24x24']:
+                    if s in file_path.stem:
+                        new_name = f"{asset_name}_sprite_{s}.png"
+                        break
+            else:
+                # Original - assume 1024x1024
+                new_name = f"{asset_name}_1024x1024.png"
+            
+            new_path = asset_folder / new_name
+            
+            if not dry_run:
+                file_path.rename(new_path)
+            
+            print(f"    → {new_name}")
+        
+        organized += 1
+    
+    return organized
+
+def main():
+    import argparse
+    
+    parser = argparse.ArgumentParser(description='Organize ALL assets with cleanup')
+    parser.add_argument('--dry-run', action='store_true', help='Show what would be done')
+    args = parser.parse_args()
+    
+    print("=" * 70)
+    print("🧹 COMPLETE ASSET ORGANIZATION + CLEANUP")
+    print("=" * 70)
+    
+    if args.dry_run:
+        print("\n⚠️  DRY RUN MODE - No changes will be made\n")
+    
+    print("\nThis will:")
+    print("  1. 🗑️  Delete sample/test/placeholder files")
+    print("  2. 🖼️  Add 256x256 preview versions")
+    print("  3. 📁 Organize into subfolders")
+    print("  4. 🏷️  Rename to proper format")
+    print("=" * 70)
+    
+    # Get all directories
+    base_dir = Path('assets/images')
+    
+    # Skip these directories
+    skip_dirs = {'demo', 'demo_originals_with_white_bg'}
+    
+    total_organized = 0
+    
+    for subdir in sorted(base_dir.iterdir()):
+        if subdir.is_dir() and subdir.name not in skip_dirs:
+            count = organize_directory(subdir, dry_run=args.dry_run)
+            total_organized += count
+    
+    print("\n" + "=" * 70)
+    if not args.dry_run:
+        print(f"✅ COMPLETE! Organized {total_organized} asset groups")
+    else:
+        print(f"✅ DRY RUN COMPLETE! Would organize {total_organized} asset groups")
+    print("=" * 70)
+
+if __name__ == "__main__":
+    main()