diff --git a/game/modules/tome/data/general/npcs/canine.lua b/game/modules/tome/data/general/npcs/canine.lua
index 9dec0f5618a090dd6ff237bfa5808d9054783636..20d52e08aacb57f4d09b5b7e9b98ffb8ae4011ba 100644
--- a/game/modules/tome/data/general/npcs/canine.lua
+++ b/game/modules/tome/data/general/npcs/canine.lua
@@ -41,7 +41,7 @@ newEntity{
 }
 
 newEntity{ base = "BASE_NPC_CANINE",
-	name = "wolf", color=colors.UMBER,
+	name = "wolf", color=colors.UMBER, image="npc/canine_w.png",
 	desc = [[Lean, mean, and shaggy, it stares at you with hungry eyes.]],
 	level_range = {1, nil}, exp_worth = 1,
 	rarity = 1,
@@ -51,7 +51,7 @@ newEntity{ base = "BASE_NPC_CANINE",
 }
 
 newEntity{ base = "BASE_NPC_CANINE",
-	name = "great wolf", color=colors.UMBER,
+	name = "great wolf", color=colors.UMBER, image="npc/canine_gw.png",
 	desc = [[Larger than a normal wolf, it prowls and snaps at you.]],
 	level_range = {3, nil}, exp_worth = 1,
 	rarity = 3,
@@ -62,7 +62,7 @@ newEntity{ base = "BASE_NPC_CANINE",
 }
 
 newEntity{ base = "BASE_NPC_CANINE",
-	name = "dire wolf", color=colors.DARK_UMBER,
+	name = "dire wolf", color=colors.DARK_UMBER, image="npc/canine_dw.png",
 	desc = [[Easily as big as a horse, this wolf menaces you with its claws and fangs.]],
 	level_range = {4, nil}, exp_worth = 1,
 	rarity = 3,
@@ -73,7 +73,7 @@ newEntity{ base = "BASE_NPC_CANINE",
 }
 
 newEntity{ base = "BASE_NPC_CANINE",
-	name = "white wolf", color=colors.WHITE,
+	name = "white wolf", color=colors.WHITE, image="npc/canine_ww.png",
 	desc = [[A large and muscled wolf from the northern wastes. Its breath is cold and icy and its fur coated in frost.]],
 	level_range = {4, nil}, exp_worth = 1,
 	rarity = 3,
@@ -86,7 +86,7 @@ newEntity{ base = "BASE_NPC_CANINE",
 }
 
 newEntity{ base = "BASE_NPC_CANINE",
-	name = "warg", color=colors.BLACK,
+	name = "warg", color=colors.BLACK, image="npc/canine_warg.png",
 	desc = [[It is a large wolf with eyes full of cunning.]],
 	level_range = {6, nil}, exp_worth = 1,
 	rarity = 4,
@@ -97,7 +97,7 @@ newEntity{ base = "BASE_NPC_CANINE",
 }
 
 newEntity{ base = "BASE_NPC_CANINE",
-	name = "fox", color=colors.RED,
+	name = "fox", color=colors.RED, image="npc/canine_fox.png",
 	desc = [[The quick brown fox jumps over the lazy dog.]],
 	level_range = {1, nil}, exp_worth = 1,
 	rarity = 3,
@@ -107,7 +107,7 @@ newEntity{ base = "BASE_NPC_CANINE",
 }
 
 newEntity{ base = "BASE_NPC_CANINE",
-	name = "Rungof the Warg Titan", color=colors.VIOLET, unique=true,
+	name = "Rungof the Warg Titan", color=colors.VIOLET, unique=true, image="npc/canine_rungof.png",
 	desc = [[It is a large wolf with eyes full of cunning, only 3 times bigger than a normal warg.]],
 	level_range = {20, nil}, exp_worth = 2,
 	rank = 4,
diff --git a/game/modules/tome/data/general/npcs/troll.lua b/game/modules/tome/data/general/npcs/troll.lua
index 7164511403346fb0c6e8edf81593e77fa2713b03..65a8650e4ea180dff4d9068b90f974f7f7421e3d 100644
--- a/game/modules/tome/data/general/npcs/troll.lua
+++ b/game/modules/tome/data/general/npcs/troll.lua
@@ -51,7 +51,7 @@ newEntity{
 }
 
 newEntity{ base = "BASE_NPC_TROLL",
-	name = "forest troll", color=colors.YELLOW_GREEN,
+	name = "forest troll", color=colors.YELLOW_GREEN, image="npc/troll_f.png",
 	desc = [[Green-skinned and ugly, this massive humanoid glares at you, clenching wart-covered green fists.]],
 	level_range = {1, nil}, exp_worth = 1,
 	rarity = 1,
@@ -60,7 +60,7 @@ newEntity{ base = "BASE_NPC_TROLL",
 }
 
 newEntity{ base = "BASE_NPC_TROLL",
-	name = "stone troll", color=colors.DARK_SLATE_GRAY,
+	name = "stone troll", color=colors.DARK_SLATE_GRAY, image="npc/troll_s.png",
 	desc = [[A giant troll with scabrous black skin. With a shudder, you notice the belt of dwarf skulls around his massive waist.]],
 	level_range = {3, nil}, exp_worth = 1,
 	rarity = 1,
@@ -70,7 +70,7 @@ newEntity{ base = "BASE_NPC_TROLL",
 }
 
 newEntity{ base = "BASE_NPC_TROLL",
-	name = "cave troll", color=colors.SLATE,
+	name = "cave troll", color=colors.SLATE, image="npc/troll_c.png",
 	desc = [[This huge troll wields a massive spear and has a disturbingly intelligent look in its piggy eyes.]],
 	level_range = {7, nil}, exp_worth = 1,
 	rarity = 2,
@@ -80,7 +80,7 @@ newEntity{ base = "BASE_NPC_TROLL",
 }
 
 newEntity{ base = "BASE_NPC_TROLL",
-	name = "mountain troll", color=colors.UMBER,
+	name = "mountain troll", color=colors.UMBER, image="npc/troll_m.png",
 	desc = [[A large and athletic troll with an extremely tough and warty hide.]],
 	level_range = {12, nil}, exp_worth = 1,
 	rarity = 3,
@@ -90,7 +90,7 @@ newEntity{ base = "BASE_NPC_TROLL",
 }
 
 newEntity{ base = "BASE_NPC_TROLL",
-	name = "mountain troll thunderer", color=colors.AQUAMARINE,
+	name = "mountain troll thunderer", color=colors.AQUAMARINE, image="npc/troll_mt.png",
 	desc = [[A large and athletic troll with an extremely tough and warty hide.]],
 	level_range = {20, nil}, exp_worth = 1,
 	rarity = 5,
diff --git a/game/modules/tome/data/gfx/npc/canine_dw.png b/game/modules/tome/data/gfx/npc/canine_dw.png
new file mode 100644
index 0000000000000000000000000000000000000000..d84ce1a8175fbe4fd67afc5c0721e80c10cf6634
Binary files /dev/null and b/game/modules/tome/data/gfx/npc/canine_dw.png differ
diff --git a/game/modules/tome/data/gfx/npc/canine_fox.png b/game/modules/tome/data/gfx/npc/canine_fox.png
new file mode 100644
index 0000000000000000000000000000000000000000..8953918dd4248bfc69673af6f016ec6446935ff9
Binary files /dev/null and b/game/modules/tome/data/gfx/npc/canine_fox.png differ
diff --git a/game/modules/tome/data/gfx/npc/canine_gw.png b/game/modules/tome/data/gfx/npc/canine_gw.png
new file mode 100644
index 0000000000000000000000000000000000000000..a69f00dec334894976b0994de802e5ca8a7861c1
Binary files /dev/null and b/game/modules/tome/data/gfx/npc/canine_gw.png differ
diff --git a/game/modules/tome/data/gfx/npc/canine_rungof.png b/game/modules/tome/data/gfx/npc/canine_rungof.png
new file mode 100644
index 0000000000000000000000000000000000000000..d4dbfe970a11ac12f8f3c6f145672e22a85a9c9f
Binary files /dev/null and b/game/modules/tome/data/gfx/npc/canine_rungof.png differ
diff --git a/game/modules/tome/data/gfx/npc/canine_w.png b/game/modules/tome/data/gfx/npc/canine_w.png
new file mode 100644
index 0000000000000000000000000000000000000000..a8eaac992e3e5ffbcb2a92b0c46bf011c4473522
Binary files /dev/null and b/game/modules/tome/data/gfx/npc/canine_w.png differ
diff --git a/game/modules/tome/data/gfx/npc/canine_warg.png b/game/modules/tome/data/gfx/npc/canine_warg.png
new file mode 100644
index 0000000000000000000000000000000000000000..2316dbf3f1b62737e2916ba530d85684a0970cab
Binary files /dev/null and b/game/modules/tome/data/gfx/npc/canine_warg.png differ
diff --git a/game/modules/tome/data/gfx/npc/canine_ww.png b/game/modules/tome/data/gfx/npc/canine_ww.png
new file mode 100644
index 0000000000000000000000000000000000000000..8a026700505f16fd7a568fd8554903226b07c852
Binary files /dev/null and b/game/modules/tome/data/gfx/npc/canine_ww.png differ
diff --git a/game/modules/tome/data/gfx/npc/troll_bill.png b/game/modules/tome/data/gfx/npc/troll_bill.png
new file mode 100644
index 0000000000000000000000000000000000000000..bb0b0729b597500edfe7cb39cd7d079bc836fd74
Binary files /dev/null and b/game/modules/tome/data/gfx/npc/troll_bill.png differ
diff --git a/game/modules/tome/data/gfx/npc/troll_c.png b/game/modules/tome/data/gfx/npc/troll_c.png
new file mode 100644
index 0000000000000000000000000000000000000000..3b90530ca3d1f5eacf0e5f9c25f70ac90bcbfd8a
Binary files /dev/null and b/game/modules/tome/data/gfx/npc/troll_c.png differ
diff --git a/game/modules/tome/data/gfx/npc/troll_f.png b/game/modules/tome/data/gfx/npc/troll_f.png
new file mode 100644
index 0000000000000000000000000000000000000000..010069759326f8e031559e9e3c7cb3e4315f363f
Binary files /dev/null and b/game/modules/tome/data/gfx/npc/troll_f.png differ
diff --git a/game/modules/tome/data/gfx/npc/troll_m.png b/game/modules/tome/data/gfx/npc/troll_m.png
new file mode 100644
index 0000000000000000000000000000000000000000..9b04cfe50d7a64b5b7199c3073b54127ae20c789
Binary files /dev/null and b/game/modules/tome/data/gfx/npc/troll_m.png differ
diff --git a/game/modules/tome/data/gfx/npc/troll_mt.png b/game/modules/tome/data/gfx/npc/troll_mt.png
new file mode 100644
index 0000000000000000000000000000000000000000..6632624cc142f60ca0ec60f4187377e7858ca3c2
Binary files /dev/null and b/game/modules/tome/data/gfx/npc/troll_mt.png differ
diff --git a/game/modules/tome/data/gfx/npc/troll_s.png b/game/modules/tome/data/gfx/npc/troll_s.png
new file mode 100644
index 0000000000000000000000000000000000000000..dfcefa0afcb494e1f9a331c36048868de24c75fb
Binary files /dev/null and b/game/modules/tome/data/gfx/npc/troll_s.png differ
diff --git a/game/modules/tome/data/zones/trollshaws/npcs.lua b/game/modules/tome/data/zones/trollshaws/npcs.lua
index 8512a5baf993ee2ef785bcbc3625cde790b9ae06..2203becdf269d39a5fd3f7d1bf542cfb45a60677 100644
--- a/game/modules/tome/data/zones/trollshaws/npcs.lua
+++ b/game/modules/tome/data/zones/trollshaws/npcs.lua
@@ -34,7 +34,7 @@ local Talents = require("engine.interface.ActorTalents")
 newEntity{ define_as = "TROLL_BILL",
 	type = "giant", subtype = "troll", unique = true,
 	name = "Bill the Stone Troll",
-	display = "T", color=colors.VIOLET,
+	display = "T", color=colors.VIOLET, image="npc/troll_bill.png",
 	desc = [[Big, brawny, powerful and with a taste for hobbit. He has friends called Bert and Tom.
 	He is wielding a small tree trunk and towering toward you.
 	He should have turned to stone long ago, how could he still walk?!]],