diff --git a/images/icons/unit-groups/era_custom_01.png b/images/icons/unit-groups/era_custom_01_30.png
similarity index 100%
rename from images/icons/unit-groups/era_custom_01.png
rename to images/icons/unit-groups/era_custom_01_30.png
diff --git a/images/icons/unit-groups/race_bats.png b/images/icons/unit-groups/race_bats_30.png
similarity index 100%
rename from images/icons/unit-groups/race_bats.png
rename to images/icons/unit-groups/race_bats_30.png
diff --git a/images/icons/unit-groups/race_drakes.png b/images/icons/unit-groups/race_drake_30.png
similarity index 100%
rename from images/icons/unit-groups/race_drakes.png
rename to images/icons/unit-groups/race_drake_30.png
diff --git a/images/icons/unit-groups/race_dwarves.png b/images/icons/unit-groups/race_dwarf_30.png
similarity index 100%
rename from images/icons/unit-groups/race_dwarves.png
rename to images/icons/unit-groups/race_dwarf_30.png
diff --git a/images/icons/unit-groups/race_elves.png b/images/icons/unit-groups/race_elf_30.png
similarity index 100%
rename from images/icons/unit-groups/race_elves.png
rename to images/icons/unit-groups/race_elf_30.png
diff --git a/images/icons/unit-groups/race_goblins.png b/images/icons/unit-groups/race_goblin_30.png
similarity index 100%
rename from images/icons/unit-groups/race_goblins.png
rename to images/icons/unit-groups/race_goblin_30.png
diff --git a/images/icons/unit-groups/race_gryphons.png b/images/icons/unit-groups/race_gryphon_30.png
similarity index 100%
rename from images/icons/unit-groups/race_gryphons.png
rename to images/icons/unit-groups/race_gryphon_30.png
diff --git a/images/icons/unit-groups/race_humans.png b/images/icons/unit-groups/race_human_30.png
similarity index 100%
rename from images/icons/unit-groups/race_humans.png
rename to images/icons/unit-groups/race_human_30.png
diff --git a/images/icons/unit-groups/race_saurians.png b/images/icons/unit-groups/race_lizard_30.png
similarity index 100%
rename from images/icons/unit-groups/race_saurians.png
rename to images/icons/unit-groups/race_lizard_30.png
diff --git a/images/icons/unit-groups/race_merfolk.png b/images/icons/unit-groups/race_merman_30.png
similarity index 100%
rename from images/icons/unit-groups/race_merfolk.png
rename to images/icons/unit-groups/race_merman_30.png
diff --git a/images/icons/unit-groups/race_monsters.png b/images/icons/unit-groups/race_monster_30.png
similarity index 100%
rename from images/icons/unit-groups/race_monsters.png
rename to images/icons/unit-groups/race_monster_30.png
diff --git a/images/icons/unit-groups/race_nagas.png b/images/icons/unit-groups/race_naga_30.png
similarity index 100%
rename from images/icons/unit-groups/race_nagas.png
rename to images/icons/unit-groups/race_naga_30.png
diff --git a/images/icons/unit-groups/race_ogres.png b/images/icons/unit-groups/race_ogre_30.png
similarity index 100%
rename from images/icons/unit-groups/race_ogres.png
rename to images/icons/unit-groups/race_ogre_30.png
diff --git a/images/icons/unit-groups/race_orcs.png b/images/icons/unit-groups/race_orc_30.png
similarity index 100%
rename from images/icons/unit-groups/race_orcs.png
rename to images/icons/unit-groups/race_orc_30.png
diff --git a/images/icons/unit-groups/race_trolls.png b/images/icons/unit-groups/race_troll_30.png
similarity index 100%
rename from images/icons/unit-groups/race_trolls.png
rename to images/icons/unit-groups/race_troll_30.png
diff --git a/images/icons/unit-groups/race_undead.png b/images/icons/unit-groups/race_undead_30.png
similarity index 100%
rename from images/icons/unit-groups/race_undead.png
rename to images/icons/unit-groups/race_undead_30.png
diff --git a/images/icons/unit-groups/race_wolves.png b/images/icons/unit-groups/race_wolf_30.png
similarity index 100%
rename from images/icons/unit-groups/race_wolves.png
rename to images/icons/unit-groups/race_wolf_30.png
diff --git a/images/icons/unit-groups/race_woses.png b/images/icons/unit-groups/race_wose_30.png
similarity index 100%
rename from images/icons/unit-groups/race_woses.png
rename to images/icons/unit-groups/race_wose_30.png
diff --git a/src/editor/palette/unit_palette.cpp b/src/editor/palette/unit_palette.cpp
index 2e17b3d2e2d..c5062567b7b 100644
--- a/src/editor/palette/unit_palette.cpp
+++ b/src/editor/palette/unit_palette.cpp
@@ -55,31 +55,24 @@ void unit_palette::setup(const config& /*cfg*/)
 		config cfg;
 		cfg["id"] = i.second.id();
 		cfg["name"] = i.second.plural_name();
-		//TODO
-		std::string& tmp = group_map_[i.second.id()][0];
-		cfg["icon"] = item_map_.find(tmp)->second.image();
+		cfg["icon"] = "icons/unit-groups/race_" + i.second.id();
 		cfg["core"] = "yes";
 		groups_.push_back(item_group(cfg));
 	}
 
-
 	//TODO
 	//move "invalid" items to the end
 	//std::stable_partition(items.begin(), items.end(), is_valid_terrain);
 
-	// Set the default group
-
 	select_fg_item("Elvish Fighter");
 	select_bg_item("Elvish Archer");
 
+	// Set the default group
 	set_group("human");
 
 	if(active_group().empty()) {
 		ERR_ED << "No items found.\n";
 	}
-
-	//TODO
-//	update_report();
 }
 
 void unit_palette::draw_item(const unit_type& u, surface& image, std::stringstream& tooltip_text) {