diff --git a/modules/gui.lua b/modules/gui.lua
index 479cb629..d0d1dbb3 100644
--- a/modules/gui.lua
+++ b/modules/gui.lua
@@ -771,8 +771,7 @@ pfUI:RegisterModule("gui", function ()
       CreateConfig(this, "40y-Range Check Interval", C.unitframes, "rangechecki")
       CreateConfig(this, "Combopoint Size", C.unitframes, "combosize")
       CreateConfig(this, "Abbreviate Numbers (4200 -> 4.2k)", C.unitframes, "abbrevnum", "checkbox")
-      CreateConfig(this, "Enable PvP Icon", C.unitframes.player, "showPVP", "checkbox")
-      CreateConfig(this, "Align PvP Icon to Minimap", C.unitframes.player, "showPVPMinimap", "checkbox")
+      CreateConfig(this, "Show PvP Icon", C.unitframes.player, "showPVP", "checkbox")
       CreateConfig(this, "Enable Energy Ticks", C.unitframes.player, "energy", "checkbox")
       this.setup = true
     end
@@ -1168,6 +1167,7 @@ pfUI:RegisterModule("gui", function ()
       CreateConfig(this, "Enable Zone Text On Minimap Mouseover", C.appearance.minimap, "mouseoverzone", "checkbox")
       CreateConfig(this, "Disable Minimap Buffs", C.global, "hidebuff", "checkbox")
       CreateConfig(this, "Disable Minimap Weapon Buffs", C.global, "hidewbuff", "checkbox")
+      CreateConfig(this, "Show PvP Icon", C.unitframes.player, "showPVPMinimap", "checkbox")
       this.setup = true
     end
   end)
diff --git a/modules/minimap.lua b/modules/minimap.lua
index 6ac9117d..bf83cd56 100644
--- a/modules/minimap.lua
+++ b/modules/minimap.lua
@@ -143,4 +143,27 @@ pfUI:RegisterModule("minimap", function ()
     pfUI.minimapCoordinates:Hide()
     pfUI.minimapZone:Hide()
   end)
+
+  pfUI.minimap.pvpicon = CreateFrame("Frame", nil, pfUI.minimap)
+  pfUI.minimap.pvpicon:Hide()
+  pfUI.minimap.pvpicon:RegisterEvent("UPDATE_FACTION")
+  pfUI.minimap.pvpicon:RegisterEvent("UNIT_FACTION")
+  pfUI.minimap.pvpicon:SetFrameStrata("HIGH")
+  pfUI.minimap.pvpicon:SetWidth(16)
+  pfUI.minimap.pvpicon:SetHeight(16)
+  pfUI.minimap.pvpicon:SetAlpha(.5)
+  pfUI.minimap.pvpicon:SetParent(pfUI.minimap)
+  pfUI.minimap.pvpicon:SetPoint("BOTTOMRIGHT", pfUI.minimap, "BOTTOMRIGHT", -5, 5)
+  pfUI.minimap.pvpicon.texture = pfUI.minimap.pvpicon:CreateTexture(nil,"DIALOG")
+  pfUI.minimap.pvpicon.texture:SetTexture("Interface\\AddOns\\pfUI\\img\\pvp")
+  pfUI.minimap.pvpicon.texture:SetAllPoints(pfUI.minimap.pvpicon)
+
+  pfUI.minimap.pvpicon:SetScript("OnEvent", function()
+    if C.unitframes.player.showPVPMinimap == "1" and UnitIsPVP("player") then
+      pfUI.minimap.pvpicon:Show()
+    else
+      pfUI.minimap.pvpicon:Hide()
+    end
+  end)
+
 end)