diff --git a/Bindings.xml b/Bindings.xml
index 033b99a..ee60e6d 100644
--- a/Bindings.xml
+++ b/Bindings.xml
@@ -1,5 +1,5 @@
 <Bindings>
-  <Binding name="REFLEXOPEN" header="REFLEXB">
+  <Binding category="BINDING_HEADER_REFLEXB" name="REFLEXOPEN">
     if not REFlexFrame:IsVisible() then
       REFlexFrame:Show()
     else
diff --git a/REFlex.lua b/REFlex.lua
index bfc429b..8f03031 100644
--- a/REFlex.lua
+++ b/REFlex.lua
@@ -61,7 +61,7 @@ local SendAddonMessage = _G.C_ChatInfo.SendAddonMessage
 local PlaySound = _G.PlaySound
 local ElvUI = _G.ElvUI
 
-RE.Version = 3210
+RE.Version = 3220
 RE.LastSquash = 1602662400
 RE.FoundNewVersion = false
 
@@ -233,7 +233,7 @@ function RE:OnEvent(_, event, ...)
 		_G.LibStub("AceConfigRegistry-3.0"):RegisterOptionsTable("REFlex", RE.AceConfig)
 		RE.OptionsMenu = _G.LibStub("AceConfigDialog-3.0"):AddToBlizOptions("REFlex", "REFlex")
 		RegisterAddonMessagePrefix("REFlex")
-		_G.BINDING_HEADER_REFLEXB = "REFlex"
+		_G.BINDING_HEADER_REFLEXB = "|cFF74D06CRE|rFlex"
 		_G.BINDING_NAME_REFLEXOPEN = L["Show main window"]
 		_G.SlashCmdList["REFLEX"] = function()
 			if not _G.REFlexFrame:IsVisible() then
diff --git a/REFlex.toc b/REFlex.toc
index 66345e2..6b3cb1e 100644
--- a/REFlex.toc
+++ b/REFlex.toc
@@ -1,7 +1,7 @@
 ## Interface: 100000
 ## Title: |cFF74D06CRE|rFlex
 ## Notes: Collect statistics of played arena matches and battlegrounds.
-## Version: 3.2.1
+## Version: 3.2.2
 ## Author: AcidWeb
 ## SavedVariablesPerCharacter: REFlexSettings, REFlexDatabase, REFlexHonorDatabase
 ## X-WoWI-ID: 19190
diff --git a/REFlexFunctions.lua b/REFlexFunctions.lua
index 167f723..523e2bb 100644
--- a/REFlexFunctions.lua
+++ b/REFlexFunctions.lua
@@ -8,7 +8,7 @@ local DUMP = LibStub("LibTextDump-1.0")
 
 local tinsert, tsort, tconcat, tremove = _G.table.insert, _G.table.sort, _G.table.concat, _G.table.remove
 local mfloor, min, mfmod = _G.math.floor, _G.math.min, _G.math.fmod
-local sgsub, sbyte = _G.string.gsub, _G.string.byte
+local sgsub, sbyte, slower = _G.string.gsub, _G.string.byte, _G.string.lower
 local strsplit, date, select, tostring, PlaySound, time, pairs, ipairs = _G.strsplit, _G.date, _G.select, _G.tostring, _G.PlaySound, _G.time, _G.pairs, _G.ipairs
 local GetAchievementCriteriaInfo = _G.GetAchievementCriteriaInfo
 local GetHonorRewardInfo = _G.C_PvP.GetHonorRewardInfo
@@ -449,11 +449,7 @@ function RE:GetMapColorArena(_, realrow, _, table)
 end
 
 function RE:GetClassIcon(token, size)
-	return "|TInterface\\Glues\\CharacterCreate\\UI-CharacterCreate-Classes:"..size..":"..size..":0:0:256:256:" ..
-	_G.CLASS_ICON_TCOORDS[token][1]*256+5 ..
-	":" .. _G.CLASS_ICON_TCOORDS[token][2]*256-5 ..
-	":" .. _G.CLASS_ICON_TCOORDS[token][3]*256+5 ..
-	":" .. _G.CLASS_ICON_TCOORDS[token][4]*256-5 .. "|t"
+	return "|A:classicon-"..slower(token)..":"..size..":"..size.."|a"
 end
 
 function RE:GetRaceIcon(token, size)
diff --git a/REFlexStructures.lua b/REFlexStructures.lua
index b96cf40..13192c6 100644
--- a/REFlexStructures.lua
+++ b/REFlexStructures.lua
@@ -123,44 +123,44 @@ RE.MapListStat = {
 }
 
 RE.RaceIcons = {
-	["Human"]	= "raceicon-human-male",
-	["Humans"]	= "raceicon-human-male",
-	["Dwarf"]	= "raceicon-dwarf-male",
-	["Dwarves"]	= "raceicon-dwarf-male",
-	["Gnome"]	= "raceicon-gnome-male",
-	["Gnomes"]	= "raceicon-gnome-male",
-	["Night Elf"]	= "raceicon-nightelf-male",
-	["Night elves"]	= "raceicon-nightelf-male",
-	["Tauren"]	= "raceicon-tauren-male",
-	["Undead"]	= "raceicon-undead-male",
-	["Troll"]	= "raceicon-troll-male",
-	["Trolls"]	= "raceicon-troll-male",
-	["Orc"]	= "raceicon-orc-male",
-	["Orcs"]	= "raceicon-orc-male",
-	["Blood Elf"]	= "raceicon-bloodelf-male",
-	["Blood elves"]	= "raceicon-bloodelf-male",
-	["Draenei"]	= "raceicon-draenei-male",
-	["Goblin"]	= "raceicon-goblin-male",
-	["Goblins"]	= "raceicon-goblin-male",
-	["Worgen"]	= "raceicon-worgen-male",
-	["Pandaren"]	= "raceicon-pandaren-male",
-	["Nightborne"]	= "raceicon-nightborne-male",
-	["Highmountain Tauren"]	= "",
-	["Void Elf"]	= "raceicon-voidelf-male",
-	["Void elves"]	= "raceicon-voidelf-male",
-	["Lightforged Draenei"]	= "raceicon-lightforged-male",
-	["Dark Iron Dwarf"]	= "raceicon-darkirondwarf-male",
-	["Dark Iron Dwarves"]	= "raceicon-darkirondwarf-male",
-	["Mag'har Orc"]	= "raceicon-magharorc-male",
-	["Zandalari Troll"]	= "raceicon-zandalari-male",
-	["Zandalari Trolls"]	= "raceicon-zandalari-male",
-	["Kul Tiran"]	= "raceicon-kultiran-male",
-	["Vulpera"]	= "raceicon-vulpera-male",
-	["Vulperas"]	= "raceicon-vulpera-male",
-	["Mechagnome"]	= "raceicon-mechagnome-male",
-	["Mechagnomes"]	= "raceicon-mechagnome-male",
-	["Dracthyr"]	= "raceicon-dracthyr-male",
-	["Dracthyrs"]	= "raceicon-dracthyr-male",
+	["Human"]	= "raceicon128-human-male",
+	["Humans"]	= "raceicon128-human-male",
+	["Dwarf"]	= "raceicon128-dwarf-male",
+	["Dwarves"]	= "raceicon128-dwarf-male",
+	["Gnome"]	= "raceicon128-gnome-male",
+	["Gnomes"]	= "raceicon128-gnome-male",
+	["Night Elf"]	= "raceicon128-nightelf-male",
+	["Night elves"]	= "raceicon128-nightelf-male",
+	["Tauren"]	= "raceicon128-tauren-male",
+	["Undead"]	= "raceicon128-undead-male",
+	["Troll"]	= "raceicon128-troll-male",
+	["Trolls"]	= "raceicon128-troll-male",
+	["Orc"]	= "raceicon128-orc-male",
+	["Orcs"]	= "raceicon128-orc-male",
+	["Blood Elf"]	= "raceicon128-bloodelf-male",
+	["Blood elves"]	= "raceicon128-bloodelf-male",
+	["Draenei"]	= "raceicon128-draenei-male",
+	["Goblin"]	= "raceicon128-goblin-male",
+	["Goblins"]	= "raceicon128-goblin-male",
+	["Worgen"]	= "raceicon128-worgen-male",
+	["Pandaren"]	= "raceicon128-pandaren-male",
+	["Nightborne"]	= "raceicon128-nightborne-male",
+	["Highmountain Tauren"]	= "raceicon128-highmountain-male",
+	["Void Elf"]	= "raceicon128-voidelf-male",
+	["Void elves"]	= "raceicon128-voidelf-male",
+	["Lightforged Draenei"]	= "raceicon128-lightforged-male",
+	["Dark Iron Dwarf"]	= "raceicon128-darkirondwarf-male",
+	["Dark Iron Dwarves"]	= "raceicon128-darkirondwarf-male",
+	["Mag'har Orc"]	= "raceicon128-magharorc-male",
+	["Zandalari Troll"]	= "raceicon128-zandalari-male",
+	["Zandalari Trolls"]	= "raceicon128-zandalari-male",
+	["Kul Tiran"]	= "raceicon128-kultiran-male",
+	["Vulpera"]	= "raceicon128-vulpera-male",
+	["Vulperas"]	= "raceicon128-vulpera-male",
+	["Mechagnome"]	= "raceicon128-mechagnome-male",
+	["Mechagnomes"]	= "raceicon128-mechagnome-male",
+	["Dracthyr"]	= "raceicon128-dracthyr-male",
+	["Dracthyrs"]	= "raceicon128-dracthyr-male"
 }
 
 RE.BracketNames = {