diff --git a/src/minimapicons/addon/MinimapIcons.lua b/src/minimapicons/addon/MinimapIcons.lua
index 19c4f7a..a49dcf4 100644
--- a/src/minimapicons/addon/MinimapIcons.lua
+++ b/src/minimapicons/addon/MinimapIcons.lua
@@ -87,13 +87,13 @@ local NPC_CATEGORIES = {
     { name = "Auctioneer",    trackingType = "auctioneer",   icon = "Interface\\Minimap\\Tracking\\Auctioneer" },
     { name = "Banker",        trackingType = "banker",       icon = "Interface\\Minimap\\Tracking\\Banker" },
     { name = "Battle Master", trackingType = "battlemaster", icon = "Interface\\Minimap\\Tracking\\BattleMaster" },
-    { name = "Brainwasher",  trackingType = "brainwasher",  icon = "Interface\\Icons\\INV_Gizmo_01" },
+    { name = "Brainwasher",  trackingType = "brainwasher",  icon = "Interface\\Minimap\\Tracking\\Brainwasher", scale = 1.7 },
     { name = "Class Trainer", trackingType = "trainer",      icon = "Interface\\Minimap\\Tracking\\Class",
         getFilter = function() return (UnitClass("player")) end },
     { name = "Flight Master", trackingType = "flightmaster", icon = "Interface\\Minimap\\Tracking\\FlightMaster" },
     { name = "Innkeeper",     trackingType = "innkeeper",    icon = "Interface\\Minimap\\Tracking\\Innkeeper" },
     { name = "Mailbox",       trackingType = "mailbox",      icon = "Interface\\Minimap\\Tracking\\Mailbox" },
-    { name = "Poison Vendor", trackingType = "vendor",       icon = "Interface\\Icons\\INV_Potion_19",
+    { name = "Poison Vendor", trackingType = "vendor",       icon = "Interface\\Minimap\\Tracking\\Poison",
         getFilter = function() return getLocaleFilter(POISON_FILTERS) end },
     { name = "Profession Trainer", trackingType = "trainer", icon = "Interface\\Minimap\\Tracking\\Profession",
         getExclude = function() return UnitClass("player") end },
@@ -124,7 +124,7 @@ local function updateDllTracking()
         local inc = cat.getFilter and cat.getFilter() or nil
         local exc = cat.getExclude and cat.getExclude() or nil
         if activeNpcCategories[cat.name] then
-            SetObjectTypeBlip(cat.trackingType, cat.icon, 1.5, inc, exc)
+            SetObjectTypeBlip(cat.trackingType, cat.icon, cat.scale or 1.5, inc, exc)
         else
             SetObjectTypeBlip(cat.trackingType, nil, nil, inc, exc)
         end
diff --git a/src/minimapicons/assets/Interface/Minimap/Tracking/Brainwasher.blp b/src/minimapicons/assets/Interface/Minimap/Tracking/Brainwasher.blp
new file mode 100644
index 0000000..6d4b0dd
Binary files /dev/null and b/src/minimapicons/assets/Interface/Minimap/Tracking/Brainwasher.blp differ
diff --git a/src/minimapicons/assets/Interface/Minimap/Tracking/Poison.blp b/src/minimapicons/assets/Interface/Minimap/Tracking/Poison.blp
new file mode 100644
index 0000000..2a235e2
Binary files /dev/null and b/src/minimapicons/assets/Interface/Minimap/Tracking/Poison.blp differ
diff --git a/src/minimapicons/minimapicons.zig b/src/minimapicons/minimapicons.zig
index 5ef858a..3647aa1 100644
--- a/src/minimapicons/minimapicons.zig
+++ b/src/minimapicons/minimapicons.zig
@@ -767,6 +767,9 @@ fn hasActiveTracking() bool {
     for (&g_go_tracking) |*entry| {
         if (entry.active) return true;
     }
+    for (&g_go_id_tracking) |*entry| {
+        if (entry.active) return true;
+    }
     return false;
 }