diff --git a/ShaguTweaks-tbc.toc b/ShaguTweaks-tbc.toc
index 560e545..2612ff7 100644
--- a/ShaguTweaks-tbc.toc
+++ b/ShaguTweaks-tbc.toc
@@ -59,3 +59,4 @@ mods\tooltip-details.lua
 mods\hide-errors.lua
 mods\chat-tweaks.lua
 mods\hide-gryphons.lua
+mods\worldmap-colors.lua
diff --git a/ShaguTweaks.toc b/ShaguTweaks.toc
index a6c70ae..93711b2 100644
--- a/ShaguTweaks.toc
+++ b/ShaguTweaks.toc
@@ -59,3 +59,4 @@ mods\tooltip-details.lua
 mods\hide-errors.lua
 mods\chat-tweaks.lua
 mods\hide-gryphons.lua
+mods\worldmap-colors.lua
diff --git a/img/circleparty.tga b/img/circleparty.tga
new file mode 100644
index 0000000..9634f9f
Binary files /dev/null and b/img/circleparty.tga differ
diff --git a/img/circleraid.tga b/img/circleraid.tga
new file mode 100644
index 0000000..c8a5c3e
Binary files /dev/null and b/img/circleraid.tga differ
diff --git a/mods/worldmap-colors.lua b/mods/worldmap-colors.lua
new file mode 100644
index 0000000..777d0fd
--- /dev/null
+++ b/mods/worldmap-colors.lua
@@ -0,0 +1,106 @@
+local _G = _G or getfenv(0)
+
+local module = ShaguTweaks:register({
+  title = "World Map Class Colors",
+  description = "Show class colored circles on world and battlefield map.",
+  expansions = { ["vanilla"] = true, ["tbc"] = true },
+  category = "World & MiniMap",
+  enabled = true,
+})
+
+local addonpath
+local tocs = { "", "-master", "-tbc", "-wotlk" }
+for _, name in pairs(tocs) do
+  local current = string.format("ShaguTweaks%s", name)
+  local _, title = GetAddOnInfo(current)
+  if title then
+    addonpath = "Interface\\AddOns\\" .. current
+    break
+  end
+end
+
+local function SetAllPointsOffset(frame, parent, offset)
+  frame:SetPoint("TOPLEFT", parent, "TOPLEFT", offset, -offset)
+  frame:SetPoint("BOTTOMRIGHT", parent, "BOTTOMRIGHT", -offset, offset)
+end
+
+local function UpdateWorldMapColors()
+  -- throttle to to one item per .1 second
+  if ( this.tick or 1) > GetTime() then return else this.tick = GetTime() + .1 end
+
+  local frame, icon
+
+  -- initialize all button names
+  if not this.buttons then
+    this.buttons = {}
+
+    for i = 1, 4 do
+      icon = string.format("WorldMapParty%d", i)
+      this.buttons[icon] = string.format("party%d", i)
+    end
+
+    for i = 1, 4 do
+      icon = string.format("BattlefieldMinimapParty%d", i)
+      this.buttons[icon] = string.format("party%d", i)
+    end
+
+    for i = 1, 40 do
+      icon = string.format("BattlefieldMinimapRaid%d", i)
+      this.buttons[icon] = string.format("raid%d", i)
+    end
+
+    for i = 1, 40 do
+      icon = string.format("WorldMapRaid%d", i)
+      this.buttons[icon] = string.format("raid%d", i)
+    end
+  end
+
+  -- update all available buttons
+  local ingroup
+  for name, unitstr in pairs(this.buttons) do
+    frame = _G[name]
+
+    if frame and UnitExists(unitstr) then
+      icon = _G[name.."Icon"]
+      icon:SetTexture()
+
+      -- create icon if not yet existing
+      if not frame.texture then
+        frame.texture = frame:CreateTexture(nil, "OVERLAY")
+        SetAllPointsOffset(frame.texture, frame, 12, 12)
+      end
+
+      -- check if unit is in same group
+      ingroup = nil
+      for i=1,5 do -- check if unit is in group
+        if UnitName(string.format("party%d", i)) == UnitName(unitstr) then
+          ingroup = true
+        end
+      end
+
+      -- update texture according to raid/group state
+      if ingroup and frame.texture.ingroup ~= "PARTY" then
+        frame.texture:SetTexture(addonpath .. "\\img\\circleparty")
+        frame.texture.ingroup = "PARTY"
+      elseif not ingroup and frame.texture.ingroup ~= "RAID" then
+        frame.texture:SetTexture(addonpath .. "\\img\\circleraid")
+        frame.texture.ingroup = "RAID"
+      end
+
+      -- detect unit class and set color
+      local _, class = UnitClass(unitstr)
+      local color = RAID_CLASS_COLORS[class]
+      if color then
+        frame.texture:SetVertexColor(color.r, color.g, color.b)
+      else
+        frame.texture:SetVertexColor(.5,1,.5)
+      end
+    end
+  end
+end
+
+local mapcolors = CreateFrame("Frame", nil, UIParent)
+
+module.enable = function(self)
+  mapcolors:SetScript("OnUpdate", UpdateWorldMapColors)
+end