diff --git a/api/config.lua b/api/config.lua
index 7ea75974..5e04794c 100644
--- a/api/config.lua
+++ b/api/config.lua
@@ -330,7 +330,7 @@ function pfUI:LoadConfig()
   pfUI:UpdateConfig("unitframes", "tttarget",    "txthpright",       "none")
   pfUI:UpdateConfig("unitframes", "tttarget",    "overhealperc",     "10")
 
-  pfUI:UpdateConfig("unitframes", "pet",         "happinessicon",    "0")
+  pfUI:UpdateConfig("unitframes", "pet",         "happinessicon",    "2")
   pfUI:UpdateConfig("unitframes", "pet",         "happinesssize",    "12")
   pfUI:UpdateConfig("unitframes", "pet",         "width",            "100")
   pfUI:UpdateConfig("unitframes", "pet",         "height",           "14")
diff --git a/api/unitframes.lua b/api/unitframes.lua
index f77716c5..1d5738f9 100644
--- a/api/unitframes.lua
+++ b/api/unitframes.lua
@@ -1157,13 +1157,13 @@ function pfUI.uf:RefreshIndicators(unit)
       if UnitIsVisible("pet") then
         local happiness = GetPetHappiness()
         if happiness == 1 then
-          unit.happinessIcon.texture:SetTexture(pfUI.media["img:sad"])
+          unit.happinessIcon.texture:SetTexture(pfUI.media["img:sad"..unit.config.happinessicon])
           unit.happinessIcon.texture:SetVertexColor(1, 0, 0, 1)
         elseif happiness == 2 then
-          unit.happinessIcon.texture:SetTexture(pfUI.media["img:neutral"])
+          unit.happinessIcon.texture:SetTexture(pfUI.media["img:neutral"..unit.config.happinessicon])
           unit.happinessIcon.texture:SetVertexColor(1, 1, 0, 1)
         else
-          unit.happinessIcon.texture:SetTexture(pfUI.media["img:happy"])
+          unit.happinessIcon.texture:SetTexture(pfUI.media["img:happy"..unit.config.happinessicon])
           unit.happinessIcon.texture:SetVertexColor(0, 1, 0, 1)
         end
         unit.happinessIcon:Show()
diff --git a/img/happy.tga b/img/happy1.tga
similarity index 100%
rename from img/happy.tga
rename to img/happy1.tga
diff --git a/img/happy2.tga b/img/happy2.tga
new file mode 100644
index 00000000..09c8d0dc
Binary files /dev/null and b/img/happy2.tga differ
diff --git a/img/neutral.tga b/img/neutral1.tga
similarity index 100%
rename from img/neutral.tga
rename to img/neutral1.tga
diff --git a/img/neutral2.tga b/img/neutral2.tga
new file mode 100644
index 00000000..3afd29df
Binary files /dev/null and b/img/neutral2.tga differ
diff --git a/img/sad.tga b/img/sad1.tga
similarity index 100%
rename from img/sad.tga
rename to img/sad1.tga
diff --git a/img/sad2.tga b/img/sad2.tga
new file mode 100644
index 00000000..58618352
Binary files /dev/null and b/img/sad2.tga differ
diff --git a/modules/gui.lua b/modules/gui.lua
index 3ddcb774..fb5a9e74 100644
--- a/modules/gui.lua
+++ b/modules/gui.lua
@@ -948,6 +948,11 @@ pfUI:RegisterModule("gui", "vanilla:tbc", function ()
         "right:" .. T["Right"],
         "off:" .. T["Disabled"]
       },
+      ["uf_happiness"] = {
+        "0:" .. T["Disabled"],
+        "1:" .. T["Face"],
+        "2:" .. T["Rank"]
+      },
       ["uf_buff_position"] = {
         "TOPLEFT:" .. T["Top Left"],
         "TOPRIGHT:" .. T["Top Right"],
@@ -1642,7 +1647,7 @@ pfUI:RegisterModule("gui", "vanilla:tbc", function ()
         CreateConfig(U[c], T["Show Loot Icon"], C.unitframes[c], "looticon", "checkbox")
         CreateConfig(U[c], T["Show Leader Icon"], C.unitframes[c], "leadericon", "checkbox")
         if c == "pet" then
-          CreateConfig(U[c], T["Show Happiness Icon"], C.unitframes[c], "happinessicon", "checkbox")
+          CreateConfig(U[c], T["Show Happiness Icon"], C.unitframes[c], "happinessicon", "dropdown", pfUI.gui.dropdowns.uf_happiness)
           CreateConfig(U[c], T["Happiness Icon Size"], C.unitframes[c], "happinesssize")
         end
         CreateConfig(U[c], T["Show Raid Mark"], C.unitframes[c], "raidicon", "checkbox")