diff --git a/WeakAuras/Prototypes.lua b/WeakAuras/Prototypes.lua
index f9d58be..9c7675a 100644
--- a/WeakAuras/Prototypes.lua
+++ b/WeakAuras/Prototypes.lua
@@ -16,7 +16,6 @@ local GetShapeshiftFormInfo, GetShapeshiftForm = GetShapeshiftFormInfo, GetShape
 local GetRuneCooldown, UnitCastingInfo, UnitChannelInfo = GetRuneCooldown, UnitCastingInfo, UnitChannelInfo
 local UnitDetailedThreatSituation = UnitDetailedThreatSituation
 local MAX_NUM_TALENTS = MAX_NUM_TALENTS or 40
-local MONEY = MONEY
 
 local WeakAuras = WeakAuras
 local L = WeakAuras.L
@@ -8270,8 +8269,6 @@ Private.event_prototypes = {
         local gold = floor(money / 1e4)
         local silver = floor(money / 100 % 100)
         local copper = money % 100
-
-        local icon = "interface/moneyframe/ui-goldicon"
       ]=]
     end,
     args = {
@@ -8312,14 +8309,14 @@ Private.event_prototypes = {
       },
       {
         name = "icon",
-        init = "icon",
+        init = "GetCoinIcon(money)",
         store = true,
         hidden = true,
         test = "true",
       },
     },
     GetNameAndIcon = function()
-      return MONEY, "interface/moneyframe/ui-goldicon"
+      return MONEY, GetCoinIcon(GetMoney())
     end,
   },
   ["Currency"] = {
diff --git a/WeakAuras/Types.lua b/WeakAuras/Types.lua
index f31f509..0cc3391 100644
--- a/WeakAuras/Types.lua
+++ b/WeakAuras/Types.lua
@@ -1564,12 +1564,6 @@ for id, str in pairs(Private.combatlog_spell_school_types) do
   Private.combatlog_spell_school_types_for_ui[id] = ("%.3d - %s"):format(id, str)
 end
 
-Private.money_icons = {
-  ["gold"] = "interface/moneyframe/ui-goldicon",
-  ["silver"] = "interface/moneyframe/ui-silvericon",
-  ["copper"] = "interface/moneyframe/ui-coppericon"
-}
-
 Private.coin_icons = {
   ["gold"] = "|Tinterface/moneyframe/ui-goldicon:0|t",
   ["silver"] = "|Tinterface/moneyframe/ui-silvericon:0|t",
@@ -1634,11 +1628,9 @@ local function InitializeCurrencies()
 
     local icon
     if currencyType == 1 then	-- Arena points
-      icon = "Interface/PVPFrame/PVP-ArenaPoints-Icon"
+      icon = "Interface\\PVPFrame\\PVP-ArenaPoints-Icon"
     elseif currencyType == 2 then -- Honor points
-      icon = UnitFactionGroup("player") == "Alliance" and
-        "Interface/Icons/inv_misc_tournaments_symbol_human" or
-        "Interface/Icons/Achievement_PVP_H_16"
+      icon = "Interface\\BattlefieldFrame\\Battleground-".. UnitFactionGroup("player")
     end
     if itemID and iconFileID then
       icon = icon or iconFileID or "Interface\\Icons\\INV_Misc_QuestionMark" -- iconFileID not available on first login