diff --git a/binaries/data/mods/public/gui/session_new/selection_details.js b/binaries/data/mods/public/gui/session_new/selection_details.js
index 54cc3af166..b5ae69eb14 100644
--- a/binaries/data/mods/public/gui/session_new/selection_details.js
+++ b/binaries/data/mods/public/gui/session_new/selection_details.js
@@ -111,8 +111,16 @@ function displayGeneralInfo(playerState, entState, template)
 	}
 
 	// Icon
-	getGUIObjectByName("sdIconImage").sprite = template.icon_sheet;
-	getGUIObjectByName("sdIconImage").cell_id = template.icon_cell;
+	if (template.icon_sheet && typeof template.icon_cell != "undefined")
+	{
+		getGUIObjectByName("sdIconImage").sprite = template.icon_sheet;
+		getGUIObjectByName("sdIconImage").cell_id = template.icon_cell;
+	}
+	else
+	{
+		// TODO: we should require all entities to have icons, so this case never occurs
+		getGUIObjectByName("sdIconImage").sprite = "bkFillBlack";
+	}
 	getGUIObjectByName("sdIcon").tooltip = iconTooltip;
 	//getGUIObjectByName("sdIconOutline"); // Need to change color of icon outline with the playerColor
 
diff --git a/binaries/data/mods/public/simulation/templates/template_structure.xml b/binaries/data/mods/public/simulation/templates/template_structure.xml
index bba106b2ce..d8c79945f4 100644
--- a/binaries/data/mods/public/simulation/templates/template_structure.xml
+++ b/binaries/data/mods/public/simulation/templates/template_structure.xml
@@ -2,7 +2,6 @@
 <Entity parent="template_entity_full">
   <Identity>
     <GenericName>Structure</GenericName>
-    <IconSheet>PortraitSheet</IconSheet>
   </Identity>
   <BuildRestrictions>
     <PlacementType>standard</PlacementType>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit.xml b/binaries/data/mods/public/simulation/templates/template_unit.xml
index 745335640b..64a09f91bf 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit.xml
@@ -2,7 +2,6 @@
 <Entity parent="template_entity_full">
   <Identity>
     <GenericName>Unit</GenericName>
-    <IconSheet>PortraitSheet</IconSheet>
   </Identity>
   <Minimap>
     <Type>unit</Type>