diff --git a/pfUI/api/unitframes.lua b/pfUI/api/unitframes.lua
index ba18c83..76b3e41 100644
--- a/pfUI/api/unitframes.lua
+++ b/pfUI/api/unitframes.lua
@@ -882,14 +882,14 @@ function pfUI.uf:RefreshUnit(unit, component)
               break
             end
           end
-
-          -- add icons for every found buff
-          for pos, icon in pairs(active) do
-            pfUI.uf:AddIcon(unit, pos, icon)
-          end
         end
       end
 
+      -- add icons for every found buff
+      for pos, icon in pairs(active) do
+        pfUI.uf:AddIcon(unit, pos, icon)
+      end
+
       -- hide unued icon slots
       for pos=table.getn(active)+1, 6 do
         pfUI.uf:HideIcon(unit, pos)
diff --git a/pfUI/modules/chat.lua b/pfUI/modules/chat.lua
index 3ed7c6c..a54c6f8 100644
--- a/pfUI/modules/chat.lua
+++ b/pfUI/modules/chat.lua
@@ -774,7 +774,7 @@ pfUI:RegisterModule("chat", function ()
         if C.chat.global.whispermod == "1" then
           -- patch incoming whisper string to match the colors
           if string.find(text, '|cff'..wcol, 1) == 1 then
-            text = string.gsub(text, "|r", "|cff" .. wcol)
+            text = string.gsub(text, "|r", "|r|cff" .. wcol)
           end
         end