diff --git a/api/api.lua b/api/api.lua
index 3fa9e37d..a44edb22 100644
--- a/api/api.lua
+++ b/api/api.lua
@@ -293,14 +293,6 @@ function pfUI.api.GetFactionIcon(raceKey)
   return FACTION_ICON[info.faction] or ""
 end
 
--- [ GetPlayerRaceIcons ]
--- Returns the faction and race emblems of the player character.
--- return:      [string]        both inline textures, or an empty string
-function pfUI.api.GetPlayerRaceIcons()
-  local _, raceKey = UnitRace("player")
-  return pfUI.api.GetFactionIcon(raceKey) .. pfUI.api.GetRaceIcon(raceKey, UnitSex("player"))
-end
-
 -- [ strvertical ]
 -- Creates vertical text using linebreaks. Multibyte char friendly.
 -- 'str'        [string]        String to columnize.
diff --git a/api/config.lua b/api/config.lua
index d8139017..fa70743b 100644
--- a/api/config.lua
+++ b/api/config.lua
@@ -826,7 +826,8 @@ function pfUI:LoadConfig()
   pfUI:UpdateConfig("chat",       "text",        "playerlinks",      "1")
   pfUI:UpdateConfig("chat",       "text",        "detecturl",        "1")
   pfUI:UpdateConfig("chat",       "text",        "classcolor",       "1")
-  pfUI:UpdateConfig("chat",       "text",        "playericons",      "0")
+  pfUI:UpdateConfig("chat",       "text",        "factionicons",     "0")
+  pfUI:UpdateConfig("chat",       "text",        "raceicons",        "0")
   pfUI:UpdateConfig("chat",       "text",        "playerlevel",      "0")
   pfUI:UpdateConfig("chat",       "left",        "width",            "380")
   pfUI:UpdateConfig("chat",       "left",        "height",           "180")
diff --git a/modules/chat.lua b/modules/chat.lua
index 5c9532f8..4bcf94ab 100644
--- a/modules/chat.lua
+++ b/modules/chat.lua
@@ -843,8 +843,11 @@ pfUI:RegisterModule("chat", function ()
           end
           if class and class ~= UNKNOWN then
             color = "|c" .. PFUI_CLASS_COLORS[class].colorStr
-            if C.chat.text.playericons == "1" then
-              icon = GetFactionIcon(raceKey) .. GetRaceIcon(raceKey, sex)
+            if C.chat.text.factionicons == "1" then
+              icon = GetFactionIcon(raceKey)
+            end
+            if C.chat.text.raceicons == "1" then
+              icon = icon .. GetRaceIcon(raceKey, sex)
             end
           elseif C.chat.text.tintunknown == "1" then
             color = unknowncolorhex
diff --git a/modules/gui.lua b/modules/gui.lua
index 29e1a60d..77a4326d 100644
--- a/modules/gui.lua
+++ b/modules/gui.lua
@@ -2879,7 +2879,9 @@ pfUI:RegisterModule("gui", function ()
       CreateConfig(nil, T["Generate Playerlinks"], C.chat.text, "playerlinks", "checkbox")
       CreateConfig(nil, T["Enable URL Detection"], C.chat.text, "detecturl", "checkbox")
       CreateConfig(nil, T["Enable Class Colors"], C.chat.text, "classcolor", "checkbox")
-      CreateConfig(nil, T["Show Faction & Race Icons"] .. " " .. GetPlayerRaceIcons(), C.chat.text, "playericons", "checkbox")
+      local _, playerRace = UnitRace("player")
+      CreateConfig(nil, T["Show Faction Icons"] .. " " .. GetFactionIcon(playerRace), C.chat.text, "factionicons", "checkbox")
+      CreateConfig(nil, T["Show Race Icons"] .. " " .. GetRaceIcon(playerRace, UnitSex("player")), C.chat.text, "raceicons", "checkbox")
       CreateConfig(nil, T["Enable Player Levels"], C.chat.text, "playerlevel", "checkbox")
       CreateConfig(nil, T["Colorize Unknown Classes"], C.chat.text, "tintunknown", "checkbox")
       CreateConfig(nil, T["Unknown Class Color"], C.chat.text, "unknowncolor", "color")