diff --git a/api/config.lua b/api/config.lua
index 493ffa0b..1af06b7c 100644
--- a/api/config.lua
+++ b/api/config.lua
@@ -393,6 +393,7 @@ function pfUI:LoadConfig()
   pfUI:UpdateConfig("bars",       "shapeshift",  "formfactor",       "10 x 1")
   pfUI:UpdateConfig("bars",       "pet",         "formfactor",       "10 x 1")
 
+  pfUI:UpdateConfig("panel",      nil,           "use_unitfonts",    "1")
   pfUI:UpdateConfig("panel",      "left",        "left",             "guild")
   pfUI:UpdateConfig("panel",      "left",        "center",           "durability")
   pfUI:UpdateConfig("panel",      "left",        "right",            "friends")
diff --git a/modules/chat.lua b/modules/chat.lua
index 94dcc59a..3535f6d4 100644
--- a/modules/chat.lua
+++ b/modules/chat.lua
@@ -15,6 +15,9 @@ pfUI:RegisterModule("chat", function ()
     "and world channels and lootinformation to the right chat.")
   end
 
+  local panelfont = C.panel.use_unitfonts == "1" and pfUI.font_square or pfUI.font_default
+  local panelfont_size = C.panel.use_unitfonts == "1" and C.global.font_square_size or C.global.font_size
+
   local default_border = C.appearance.border.default
   if C.appearance.border.chat ~= "-1" then
     default_border = C.appearance.border.chat
@@ -346,7 +349,7 @@ pfUI:RegisterModule("chat", function ()
 
       local _, class = UnitClass("player")
       _G["ChatFrame" .. i .. "TabText"]:SetTextColor(RAID_CLASS_COLORS[class].r + .3 * .5, RAID_CLASS_COLORS[class].g + .3 * .5, RAID_CLASS_COLORS[class].b + .3 * .5, 1)
-      _G["ChatFrame" .. i .. "TabText"]:SetFont(pfUI.font_default, C.global.font_size, "OUTLINE")
+      _G["ChatFrame" .. i .. "TabText"]:SetFont(panelfont,panelfont_size, "OUTLINE")
 
       if _G["ChatFrame" .. i].isDocked or _G["ChatFrame" .. i]:IsVisible() then
         _G["ChatFrame" .. i .. "Tab"]:Show()
diff --git a/modules/gui.lua b/modules/gui.lua
index 911a68cc..a4188c96 100644
--- a/modules/gui.lua
+++ b/modules/gui.lua
@@ -1232,6 +1232,7 @@ pfUI:RegisterModule("gui", function ()
   -- panels
   pfUI.gui.panel = pfUI.gui:CreateConfigTab("Panel")
   local values = { "time", "fps", "exp", "gold", "friends", "guild", "durability", "zone", "combat", "ammo", "soulshard", "none" }
+  pfUI.gui:CreateConfig(pfUI.gui.panel, "Use Unit Fonts", C.panel, "use_unitfonts", "checkbox")
   pfUI.gui:CreateConfig(pfUI.gui.panel, "Left Panel: Left", C.panel.left, "left", "dropdown", values)
   pfUI.gui:CreateConfig(pfUI.gui.panel, "Left Panel: Center", C.panel.left, "center", "dropdown", values)
   pfUI.gui:CreateConfig(pfUI.gui.panel, "Left Panel: Right", C.panel.left, "right", "dropdown", values)
diff --git a/modules/panel.lua b/modules/panel.lua
index 9a892d1b..fb3c4037 100644
--- a/modules/panel.lua
+++ b/modules/panel.lua
@@ -1,4 +1,8 @@
 pfUI:RegisterModule("panel", function ()
+
+  local font = C.panel.use_unitfonts == "1" and pfUI.font_square or pfUI.font_default
+  local font_size = C.panel.use_unitfonts == "1" and C.global.font_square_size or C.global.font_size
+
   local default_border = C.appearance.border.default
   if C.appearance.border.panels ~= "-1" then
     default_border = C.appearance.border.panels
@@ -66,7 +70,7 @@ pfUI:RegisterModule("panel", function ()
 
   pfUI.panel.clock.timerFrame.text = pfUI.panel.clock.timerFrame:CreateFontString("Status", "LOW", "GameFontNormal")
   pfUI.panel.clock.timerFrame.text:SetFontObject(GameFontWhite)
-  pfUI.panel.clock.timerFrame.text:SetFont(pfUI.font_default, C.global.font_size, "OUTLINE")
+  pfUI.panel.clock.timerFrame.text:SetFont(font, font_size, "OUTLINE")
   pfUI.panel.clock.timerFrame.text:SetAllPoints(pfUI.panel.clock.timerFrame)
 
   pfUI.panel.clock.timerFrame:SetScript("OnUpdate", function()
@@ -492,7 +496,7 @@ pfUI:RegisterModule("panel", function ()
   pfUI.panel.left.left:SetHeight(pfUI.panel.left:GetHeight())
   pfUI.panel.left.left:SetPoint("LEFT", 0, 0)
   pfUI.panel.left.left.text = pfUI.panel.left.left:CreateFontString("Status", "LOW", "GameFontNormal")
-  pfUI.panel.left.left.text:SetFont(pfUI.font_default, C.global.font_size, "OUTLINE")
+  pfUI.panel.left.left.text:SetFont(font, font_size, "OUTLINE")
   pfUI.panel.left.left.text:ClearAllPoints()
   pfUI.panel.left.left.text:SetAllPoints(pfUI.panel.left.left)
   pfUI.panel.left.left.text:SetPoint("CENTER", 0, 0)
@@ -504,7 +508,7 @@ pfUI:RegisterModule("panel", function ()
   pfUI.panel.left.center:SetHeight(pfUI.panel.left:GetHeight())
   pfUI.panel.left.center:SetPoint("CENTER", 0, 0)
   pfUI.panel.left.center.text = pfUI.panel.left.center:CreateFontString("Status", "LOW", "GameFontNormal")
-  pfUI.panel.left.center.text:SetFont(pfUI.font_default, C.global.font_size, "OUTLINE")
+  pfUI.panel.left.center.text:SetFont(font, font_size, "OUTLINE")
   pfUI.panel.left.center.text:ClearAllPoints()
   pfUI.panel.left.center.text:SetAllPoints(pfUI.panel.left.center)
   pfUI.panel.left.center.text:SetPoint("CENTER", 0, 0)
@@ -516,7 +520,7 @@ pfUI:RegisterModule("panel", function ()
   pfUI.panel.left.right:SetHeight(pfUI.panel.left:GetHeight())
   pfUI.panel.left.right:SetPoint("RIGHT", 0, 0)
   pfUI.panel.left.right.text = pfUI.panel.left.right:CreateFontString("Status", "LOW", "GameFontNormal")
-  pfUI.panel.left.right.text:SetFont(pfUI.font_default, C.global.font_size, "OUTLINE")
+  pfUI.panel.left.right.text:SetFont(font, font_size, "OUTLINE")
   pfUI.panel.left.right.text:ClearAllPoints()
   pfUI.panel.left.right.text:SetAllPoints(pfUI.panel.left.right)
   pfUI.panel.left.right.text:SetPoint("CENTER", 0, 0)
@@ -558,7 +562,7 @@ pfUI:RegisterModule("panel", function ()
   pfUI.panel.right.left:SetHeight(pfUI.panel.right:GetHeight())
   pfUI.panel.right.left:SetPoint("LEFT", 0, 0)
   pfUI.panel.right.left.text = pfUI.panel.right.left:CreateFontString("Status", "LOW", "GameFontNormal")
-  pfUI.panel.right.left.text:SetFont(pfUI.font_default, C.global.font_size, "OUTLINE")
+  pfUI.panel.right.left.text:SetFont(font, font_size, "OUTLINE")
   pfUI.panel.right.left.text:ClearAllPoints()
   pfUI.panel.right.left.text:SetAllPoints(pfUI.panel.right.left)
   pfUI.panel.right.left.text:SetPoint("CENTER", 0, 0)
@@ -570,7 +574,7 @@ pfUI:RegisterModule("panel", function ()
   pfUI.panel.right.center:SetHeight(pfUI.panel.right:GetHeight())
   pfUI.panel.right.center:SetPoint("CENTER", 0, 0)
   pfUI.panel.right.center.text = pfUI.panel.right.center:CreateFontString("Status", "LOW", "GameFontNormal")
-  pfUI.panel.right.center.text:SetFont(pfUI.font_default, C.global.font_size, "OUTLINE")
+  pfUI.panel.right.center.text:SetFont(font, font_size, "OUTLINE")
   pfUI.panel.right.center.text:ClearAllPoints()
   pfUI.panel.right.center.text:SetAllPoints(pfUI.panel.right.center)
   pfUI.panel.right.center.text:SetPoint("CENTER", 0, 0)
@@ -582,7 +586,7 @@ pfUI:RegisterModule("panel", function ()
   pfUI.panel.right.right:SetHeight(pfUI.panel.right:GetHeight())
   pfUI.panel.right.right:SetPoint("RIGHT", 0, 0)
   pfUI.panel.right.right.text = pfUI.panel.right.right:CreateFontString("Status", "LOW", "GameFontNormal")
-  pfUI.panel.right.right.text:SetFont(pfUI.font_default, C.global.font_size, "OUTLINE")
+  pfUI.panel.right.right.text:SetFont(font, font_size, "OUTLINE")
   pfUI.panel.right.right.text:ClearAllPoints()
   pfUI.panel.right.right.text:SetAllPoints(pfUI.panel.right.right)
   pfUI.panel.right.right.text:SetPoint("CENTER", 0, 0)
@@ -601,7 +605,7 @@ pfUI:RegisterModule("panel", function ()
   end
   pfUI.panel.minimap:SetFrameStrata("BACKGROUND")
   pfUI.panel.minimap.text = pfUI.panel.minimap:CreateFontString("MinimapZoneText", "LOW", "GameFontNormal")
-  pfUI.panel.minimap.text:SetFont(pfUI.font_default, C.global.font_size, "OUTLINE")
+  pfUI.panel.minimap.text:SetFont(font, font_size, "OUTLINE")
   pfUI.panel.minimap.text:SetPoint("CENTER", 0, 0)
   pfUI.panel.minimap.text:SetFontObject(GameFontWhite)