Index: ps/trunk/binaries/data/mods/public/gui/common/resources/food_fish.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/common/resources/food_fish.xml
+++ ps/trunk/binaries/data/mods/public/gui/common/resources/food_fish.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<setup>
+	<icon name="icon_food_fish"
+		sprite="stretched:session/icons/resources/fish_small.png"
+		size="16 16"
+	/>
+</setup>
Index: ps/trunk/binaries/data/mods/public/gui/common/resources/food_fruit.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/common/resources/food_fruit.xml
+++ ps/trunk/binaries/data/mods/public/gui/common/resources/food_fruit.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<setup>
+	<icon name="icon_food_fruit"
+		sprite="stretched:session/icons/resources/fruit_small.png"
+		size="16 16"
+	/>
+</setup>
Index: ps/trunk/binaries/data/mods/public/gui/common/resources/food_grain.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/common/resources/food_grain.xml
+++ ps/trunk/binaries/data/mods/public/gui/common/resources/food_grain.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<setup>
+	<icon name="icon_food_grain"
+		sprite="stretched:session/icons/resources/grain_small.png"
+		size="16 16"
+	/>
+</setup>
Index: ps/trunk/binaries/data/mods/public/gui/common/resources/food_meat.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/common/resources/food_meat.xml
+++ ps/trunk/binaries/data/mods/public/gui/common/resources/food_meat.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<setup>
+	<icon name="icon_food_meat"
+		sprite="stretched:session/icons/resources/meat_small.png"
+		size="16 16"
+	/>
+</setup>
Index: ps/trunk/binaries/data/mods/public/gui/common/resources/metal_ore.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/common/resources/metal_ore.xml
+++ ps/trunk/binaries/data/mods/public/gui/common/resources/metal_ore.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<setup>
+	<icon name="icon_metal_ore"
+		sprite="stretched:session/icons/resources/metal_small.png"
+		size="16 16"
+	/>
+</setup>
Index: ps/trunk/binaries/data/mods/public/gui/common/resources/stone_rock.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/common/resources/stone_rock.xml
+++ ps/trunk/binaries/data/mods/public/gui/common/resources/stone_rock.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<setup>
+	<icon name="icon_stone_rock"
+		sprite="stretched:session/icons/resources/stone_small.png"
+		size="16 16"
+	/>
+</setup>
Index: ps/trunk/binaries/data/mods/public/gui/common/resources/wood_tree.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/common/resources/wood_tree.xml
+++ ps/trunk/binaries/data/mods/public/gui/common/resources/wood_tree.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<setup>
+	<icon name="icon_wood_tree"
+		sprite="stretched:session/icons/resources/wood_small.png"
+		size="16 16"
+	/>
+</setup>
Index: ps/trunk/binaries/data/mods/public/gui/common/tooltips.js
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/common/tooltips.js
+++ ps/trunk/binaries/data/mods/public/gui/common/tooltips.js
@@ -703,23 +703,20 @@
 	if (!template.resourceGatherRates)
 		return "";
 
-	// Average the resource rates (TODO: distinguish between subtypes)
 	let rates = {};
 	for (let resource of g_ResourceData.GetResources())
 	{
 		let types = [resource.code];
 		for (let subtype in resource.subtypes)
-			// We ignore ruins as those are not that common and skew the results
-			if (subtype !== "ruins")
-				types.push(resource.code + "." + subtype);
-
-		let [rate, count] = types.reduce((sum, t) => {
-			let r = template.resourceGatherRates[t];
-			return [sum[0] + (r > 0 ? r : 0), sum[1] + (r > 0 ? 1 : 0)];
-		}, [0, 0]);
-
-		if (rate > 0)
-			rates[resource.code] = +(rate / count).toFixed(2);
+		{
+			// We ignore ruins as those are not that common
+			if (subtype == "ruins")
+				continue;
+
+			let rate = template.resourceGatherRates[resource.code + "." + subtype];
+			if (rate > 0)
+				rates[resource.code + "_" + subtype] = rate;
+		}
 	}
 
 	if (!Object.keys(rates).length)