diff --git a/binaries/data/mods/public/art/textures/ui/session/icons/resources/fish_small.png b/binaries/data/mods/public/art/textures/ui/session/icons/resources/fish_small.png
new file mode 100644
index 0000000000..056e5fedad
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/ui/session/icons/resources/fish_small.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d35c9fcec94bd8ba0925feb23434f32a18e19a5ce7c48441c8a7494f22f949e0
+size 9903
diff --git a/binaries/data/mods/public/art/textures/ui/session/icons/resources/fruit_small.png b/binaries/data/mods/public/art/textures/ui/session/icons/resources/fruit_small.png
new file mode 100644
index 0000000000..7f5879e1e8
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/ui/session/icons/resources/fruit_small.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2504175040aa275a805c8a4bad98042c37c259f5374418ef668d852eb3311b30
+size 600
diff --git a/binaries/data/mods/public/art/textures/ui/session/icons/resources/grain_small.png b/binaries/data/mods/public/art/textures/ui/session/icons/resources/grain_small.png
new file mode 100644
index 0000000000..9f30d4979c
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/ui/session/icons/resources/grain_small.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:377beb4cac667c31aa77fc5639ac742d494dc14dd2bfbc507cb333320e488103
+size 475
diff --git a/binaries/data/mods/public/art/textures/ui/session/icons/resources/meat_small.png b/binaries/data/mods/public/art/textures/ui/session/icons/resources/meat_small.png
new file mode 100644
index 0000000000..6f7750ad50
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/ui/session/icons/resources/meat_small.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2ebc98fc7fd2f06cdf944c9be9c5738e9482551c8f76d9a56e520fcfea001052
+size 878
diff --git a/binaries/data/mods/public/gui/common/resources/food_fish.xml b/binaries/data/mods/public/gui/common/resources/food_fish.xml
new file mode 100644
index 0000000000..33d9d6bf7b
--- /dev/null
+++ b/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>
diff --git a/binaries/data/mods/public/gui/common/resources/food_fruit.xml b/binaries/data/mods/public/gui/common/resources/food_fruit.xml
new file mode 100644
index 0000000000..2b295808d1
--- /dev/null
+++ b/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>
diff --git a/binaries/data/mods/public/gui/common/resources/food_grain.xml b/binaries/data/mods/public/gui/common/resources/food_grain.xml
new file mode 100644
index 0000000000..afe31c7cb1
--- /dev/null
+++ b/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>
diff --git a/binaries/data/mods/public/gui/common/resources/food_meat.xml b/binaries/data/mods/public/gui/common/resources/food_meat.xml
new file mode 100644
index 0000000000..477098dfe2
--- /dev/null
+++ b/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>
diff --git a/binaries/data/mods/public/gui/common/resources/metal_ore.xml b/binaries/data/mods/public/gui/common/resources/metal_ore.xml
new file mode 100644
index 0000000000..4514ebbaba
--- /dev/null
+++ b/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>
diff --git a/binaries/data/mods/public/gui/common/resources/stone_rock.xml b/binaries/data/mods/public/gui/common/resources/stone_rock.xml
new file mode 100644
index 0000000000..e649d7b9fb
--- /dev/null
+++ b/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>
diff --git a/binaries/data/mods/public/gui/common/resources/wood_tree.xml b/binaries/data/mods/public/gui/common/resources/wood_tree.xml
new file mode 100644
index 0000000000..edcf828214
--- /dev/null
+++ b/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>
diff --git a/binaries/data/mods/public/gui/common/tooltips.js b/binaries/data/mods/public/gui/common/tooltips.js
index 2301157097..a084135b52 100644
--- a/binaries/data/mods/public/gui/common/tooltips.js
+++ b/binaries/data/mods/public/gui/common/tooltips.js
@@ -703,23 +703,20 @@ function getGatherTooltip(template)
 	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);
+		{
+			// We ignore ruins as those are not that common
+			if (subtype == "ruins")
+				continue;
 
-		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);
+			let rate = template.resourceGatherRates[resource.code + "." + subtype];
+			if (rate > 0)
+				rates[resource.code + "_" + subtype] = rate;
+		}
 	}
 
 	if (!Object.keys(rates).length)