diff --git a/ShestakUI/Config/Filters/RaidAuraWatch.lua b/ShestakUI/Config/Filters/RaidAuraWatch.lua
index 6e8daeb9a9..7732b65404 100644
--- a/ShestakUI/Config/Filters/RaidAuraWatch.lua
+++ b/ShestakUI/Config/Filters/RaidAuraWatch.lua
@@ -536,65 +536,69 @@ T.RaidDebuffs = {
 	[SpellName(94794)] = 4,		-- Rocket Fuel Leak
 	[SpellName(116888)] = 4,	-- Shroud of Purgatory
 	[SpellName(121175)] = 2,	-- Orb of Power
+}
 -----------------------------------------------------------------
 -- PvP
 -----------------------------------------------------------------
-	-- Death Knight
-	--[[[SpellName(115001)] = 3,	-- Remorseless Winter
-	[SpellName(108194)] = 3,	-- Asphyxiate
-	[SpellName(91797)] = 3,		-- Monstrous Blow (Mutated Ghoul)
-	[SpellName(91800)] = 3,		-- Gnaw (Ghoul)
-	[SpellName(47476)] = 3,		-- Strangulate
-	-- Druid
-	[SpellName(33786)] = 3,		-- Cyclone
-	[SpellName(339)] = 2,		-- Entangling Roots
-	[SpellName(78675)] = 3,		-- Solar Beam
-	-- Hunter
-	[SpellName(3355)] = 3,		-- Freezing Trap
-	[SpellName(19386)] = 3,		-- Wyvern Sting
-	[SpellName(117526)] = 3,	-- Binding Shot
-	[SpellName(24394)] = 3,		-- Intimidation
-	-- Mage
-	[SpellName(61305)] = 3,		-- Polymorph
-	[SpellName(82691)] = 3,		-- Ring of Frost
-	[SpellName(44572)] = 3,		-- Deep Freeze
-	[SpellName(31661)] = 3,		-- Dragon's Breath
-	[SpellName(102051)] = 3,	-- Frostjaw
-	[SpellName(122)] = 2,		-- Frost Nova
-	[SpellName(111340)] = 2,	-- Ice Ward
-	-- Monk
-	[SpellName(115078)] = 3,	-- Paralysis
-	[SpellName(119381)] = 3,	-- Leg Sweep
-	-- Paladin
-	[SpellName(20066)] = 3,		-- Repentance
-	[SpellName(853)] = 3,		-- Hammer of Justice
-	[SpellName(105593)] = 3,	-- Fist of Justice
-	[SpellName(105421)] = 3,	-- Blinding Light
-	-- Priest
-	[SpellName(605)] = 3,		-- Dominate Mind
-	[SpellName(8122)] = 3,		-- Psychic Scream
-	[SpellName(64044)] = 3,		-- Psychic Horror
-	[SpellName(15487)] = 3,		-- Silence
-	-- Rogue
-	[SpellName(6770)] = 3,		-- Sap
-	[SpellName(2094)] = 3,		-- Blind
-	[SpellName(1776)] = 3,		-- Gouge
-	-- Shaman
-	[SpellName(51514)] = 3,		-- Hex
-	[SpellName(118905)] = 3,	-- Static Charge
-	[SpellName(63685)] = 2,		-- Frozen Power
-	-- Warlock
-	[SpellName(118699)] = 3,	-- Fear
-	[SpellName(6789)] = 3,		-- Mortal Coil
-	[SpellName(5484)] = 3,		-- Howl of Terror
-	[SpellName(6358)] = 3,		-- Seduction (Succubus)
-	[SpellName(115268)] = 3,	-- Mesmerize (Shivarra)
-	[SpellName(30283)] = 3,		-- Shadowfury
-	-- Warrior
-	[SpellName(46968)] = 3,		-- Shockwave
-	[SpellName(132169)] = 3,	-- Storm Bolt
-	[SpellName(5246)] = 3,		-- Intimidating Shout]]
-}
+if C.raidframe.plugins_pvp_debuffs == true then
+	T.PvPDebuffs = {
+		-- Death Knight
+		[SpellName(115001)] = 3,	-- Remorseless Winter
+		[SpellName(108194)] = 3,	-- Asphyxiate
+		[SpellName(91797)] = 3,		-- Monstrous Blow (Mutated Ghoul)
+		[SpellName(91800)] = 3,		-- Gnaw (Ghoul)
+		[SpellName(47476)] = 3,		-- Strangulate
+		-- Druid
+		[SpellName(33786)] = 3,		-- Cyclone
+		[SpellName(339)] = 2,		-- Entangling Roots
+		[SpellName(78675)] = 3,		-- Solar Beam
+		-- Hunter
+		[SpellName(3355)] = 3,		-- Freezing Trap
+		[SpellName(19386)] = 3,		-- Wyvern Sting
+		[SpellName(117526)] = 3,	-- Binding Shot
+		[SpellName(24394)] = 3,		-- Intimidation
+		-- Mage
+		[SpellName(61305)] = 3,		-- Polymorph
+		[SpellName(82691)] = 3,		-- Ring of Frost
+		[SpellName(44572)] = 3,		-- Deep Freeze
+		[SpellName(31661)] = 3,		-- Dragon's Breath
+		[SpellName(102051)] = 3,	-- Frostjaw
+		[SpellName(122)] = 2,		-- Frost Nova
+		[SpellName(111340)] = 2,	-- Ice Ward
+		-- Monk
+		[SpellName(115078)] = 3,	-- Paralysis
+		[SpellName(119381)] = 3,	-- Leg Sweep
+		-- Paladin
+		[SpellName(20066)] = 3,		-- Repentance
+		[SpellName(853)] = 3,		-- Hammer of Justice
+		[SpellName(105593)] = 3,	-- Fist of Justice
+		[SpellName(105421)] = 3,	-- Blinding Light
+		-- Priest
+		[SpellName(605)] = 3,		-- Dominate Mind
+		[SpellName(8122)] = 3,		-- Psychic Scream
+		[SpellName(64044)] = 3,		-- Psychic Horror
+		[SpellName(15487)] = 3,		-- Silence
+		-- Rogue
+		[SpellName(6770)] = 3,		-- Sap
+		[SpellName(2094)] = 3,		-- Blind
+		[SpellName(1776)] = 3,		-- Gouge
+		-- Shaman
+		[SpellName(51514)] = 3,		-- Hex
+		[SpellName(118905)] = 3,	-- Static Charge
+		[SpellName(63685)] = 2,		-- Frozen Power
+		-- Warlock
+		[SpellName(118699)] = 3,	-- Fear
+		[SpellName(6789)] = 3,		-- Mortal Coil
+		[SpellName(5484)] = 3,		-- Howl of Terror
+		[SpellName(6358)] = 3,		-- Seduction (Succubus)
+		[SpellName(115268)] = 3,	-- Mesmerize (Shivarra)
+		[SpellName(30283)] = 3,		-- Shadowfury
+		-- Warrior
+		[SpellName(46968)] = 3,		-- Shockwave
+		[SpellName(132169)] = 3,	-- Storm Bolt
+		[SpellName(194958)] = 3,	-- Intimidating Shout
+	}
+end
 
 T.RaidDebuffsReverse = {
 	--[spellID] = true,			-- Spell name
diff --git a/ShestakUI/Config/Settings.lua b/ShestakUI/Config/Settings.lua
index a8d425261f..b3e983259d 100644
--- a/ShestakUI/Config/Settings.lua
+++ b/ShestakUI/Config/Settings.lua
@@ -505,6 +505,7 @@ C["raidframe"] = {
 	["plugins_debuffhighlight_icon"] = false,	-- Debuff highlight texture + icon
 	["plugins_aura_watch"] = true,				-- Raid debuff icons
 	["plugins_aura_watch_timer"] = false,		-- Timer on raid debuff icons
+	["plugins_pvp_debuffs"] = false,			-- Show also PvP debuff icons (from the list)
 	["plugins_healcomm"] = true,				-- Incoming heal bar on raid frame
 	["plugins_auto_resurrection"] = false,		-- Auto cast resurrection on middle-click(doesn't work with Clique)
 }
diff --git a/ShestakUI/Libs/oUF/Modules/RaidDebuffs.lua b/ShestakUI/Libs/oUF/Modules/RaidDebuffs.lua
index cb14b48423..f89444dffd 100644
--- a/ShestakUI/Libs/oUF/Modules/RaidDebuffs.lua
+++ b/ShestakUI/Libs/oUF/Modules/RaidDebuffs.lua
@@ -230,8 +230,16 @@ local Update = function(self, event, unit)
 			end
 
 			local prio = rd.Debuffs and rd.Debuffs[rd.MatchBySpellName and name or spellId]
-			if not T.RaidDebuffsIgnore[spellId] and prio and (prio > rd.priority) then
-				rd.priority = prio
+			local prioPvP
+			if C.raidframe.plugins_pvp_debuffs == true then
+				prioPvP = rd.Debuffs and T.PvPDebuffs[rd.MatchBySpellName and name or spellId]
+			end
+			if not T.RaidDebuffsIgnore[spellId] and (prio and (prio > rd.priority) or prioPvP and (prioPvP > rd.priority)) then
+				if (prio and not prioPvP) or ((prio and prioPvP) and prio > prioPvP) then
+					rd.priority = prio
+				else
+					rd.priority = prioPvP
+				end
 				rd.index = i
 				rd.type = "Custom"
 				rd.filter = filter
diff --git a/ShestakUI_Config/Locales/Chinese.lua b/ShestakUI_Config/Locales/Chinese.lua
index 4e5a66f40a..5681b5b4bf 100644
--- a/ShestakUI_Config/Locales/Chinese.lua
+++ b/ShestakUI_Config/Locales/Chinese.lua
@@ -393,6 +393,7 @@ L_GUI_UF_ICONS_READY_CHECK = "就绪确认标记"
 L_GUI_UF_PLUGINS_DEBUFFHIGHLIGHT_ICON = "高亮DeBuff图示"
 L_GUI_UF_PLUGINS_AURA_WATCH = "团队法术监视"
 L_GUI_UF_PLUGINS_AURA_WATCH_TIMER = "团队减益时间"
+L_GUI_UF_PLUGINS_PVP_DEBUFFS = "Show also PvP debuff icons (from the list)" -- Need review
 L_GUI_UF_PLUGINS_HEALCOMM = "受到的治疗"
 L_GUI_UF_PLUGINS_AUTO_RESURRECTION = "鼠标中键点击已死亡角色时,自动施放复活技能(Clique启用时无效)"
 
diff --git a/ShestakUI_Config/Locales/English.lua b/ShestakUI_Config/Locales/English.lua
index 1c17af6387..588e051d3c 100644
--- a/ShestakUI_Config/Locales/English.lua
+++ b/ShestakUI_Config/Locales/English.lua
@@ -390,6 +390,7 @@ L_GUI_UF_ICONS_READY_CHECK = "Ready check icons"
 L_GUI_UF_PLUGINS_DEBUFFHIGHLIGHT_ICON = "Debuff highlight texture + icon"
 L_GUI_UF_PLUGINS_AURA_WATCH = "Raid debuff icons"
 L_GUI_UF_PLUGINS_AURA_WATCH_TIMER = "Timer on raid debuff icons"
+L_GUI_UF_PLUGINS_PVP_DEBUFFS = "Show also PvP debuff icons (from the list)"
 L_GUI_UF_PLUGINS_HEALCOMM = "Show incoming heal on frame"
 L_GUI_UF_PLUGINS_AUTO_RESURRECTION = "Auto cast resurrection on middle-click (doesn't work with Clique)"
 
diff --git a/ShestakUI_Config/Locales/French.lua b/ShestakUI_Config/Locales/French.lua
index c3971162b9..4a30d51aa7 100644
--- a/ShestakUI_Config/Locales/French.lua
+++ b/ShestakUI_Config/Locales/French.lua
@@ -393,6 +393,7 @@ L_GUI_UF_ICONS_READY_CHECK = "Icone d'appel"
 L_GUI_UF_PLUGINS_DEBUFFHIGHLIGHT_ICON = "Mise en évidence des debuffs texture + îcone"
 L_GUI_UF_PLUGINS_AURA_WATCH = "Aura/debuff de raid"
 L_GUI_UF_PLUGINS_AURA_WATCH_TIMER = "Durée sur les icônes de débuff du raid"
+L_GUI_UF_PLUGINS_PVP_DEBUFFS = "Show also PvP debuff icons (from the list)" -- Need review
 L_GUI_UF_PLUGINS_HEALCOMM = "Barre de soin entrant (incoming)"
 L_GUI_UF_PLUGINS_AUTO_RESURRECTION = "Lance automatiquement le sort de résurrection de masse avec un clic central souris sur une cible morte (ne fonctionne pas avec l'addon Clique activé)"
 
diff --git a/ShestakUI_Config/Locales/German.lua b/ShestakUI_Config/Locales/German.lua
index b2692d6a42..bf02b72774 100644
--- a/ShestakUI_Config/Locales/German.lua
+++ b/ShestakUI_Config/Locales/German.lua
@@ -393,6 +393,7 @@ L_GUI_UF_ICONS_READY_CHECK = "Bereitschaftschecksymbole"
 L_GUI_UF_PLUGINS_DEBUFFHIGHLIGHT_ICON = "Debufftextur und Symbol hervorheben"
 L_GUI_UF_PLUGINS_AURA_WATCH = "'RAID' Buffüberwachung"
 L_GUI_UF_PLUGINS_AURA_WATCH_TIMER = "Timer auf Schlachtzugsdebuff Icons"
+L_GUI_UF_PLUGINS_PVP_DEBUFFS = "Show also PvP debuff icons (from the list)" -- Need review
 L_GUI_UF_PLUGINS_HEALCOMM = "Leiste für Eingehende Heilung"
 L_GUI_UF_PLUGINS_AUTO_RESURRECTION = "Mittel-Klick um automatisch Auferstehung zu zauber wenn das Ziel tot ist (funktioniert nicht wenn Clique installiert ist)"
 
diff --git a/ShestakUI_Config/Locales/Italian.lua b/ShestakUI_Config/Locales/Italian.lua
index ca1e1f8168..1e513e6834 100644
--- a/ShestakUI_Config/Locales/Italian.lua
+++ b/ShestakUI_Config/Locales/Italian.lua
@@ -393,6 +393,7 @@ L_GUI_UF_ICONS_READY_CHECK = "Icone dell'appello"
 L_GUI_UF_PLUGINS_DEBUFFHIGHLIGHT_ICON = "Evidenzia texture + icona delle penalità"
 L_GUI_UF_PLUGINS_AURA_WATCH = "Icone delle penalità d'incursione"
 L_GUI_UF_PLUGINS_AURA_WATCH_TIMER = "Timer sulle icone delle penalità d'incursione"
+L_GUI_UF_PLUGINS_PVP_DEBUFFS = "Show also PvP debuff icons (from the list)" -- Need review
 L_GUI_UF_PLUGINS_HEALCOMM = "Mostra le cure in arrivo sul riquadro"
 L_GUI_UF_PLUGINS_AUTO_RESURRECTION = "'Auto-lancia' resurrezione col tasto centrale quando l'unità è morta (non funziona con Clique attiva)"
 
diff --git a/ShestakUI_Config/Locales/Russian.lua b/ShestakUI_Config/Locales/Russian.lua
index 3067aceb2b..e2b518e241 100644
--- a/ShestakUI_Config/Locales/Russian.lua
+++ b/ShestakUI_Config/Locales/Russian.lua
@@ -393,6 +393,7 @@ L_GUI_UF_ICONS_READY_CHECK = "Отображать иконки готовнос
 L_GUI_UF_PLUGINS_DEBUFFHIGHLIGHT_ICON = "Иконка + текстура снимаемых отрицательных эффектов"
 L_GUI_UF_PLUGINS_AURA_WATCH = "Отображать рейдовые отрицательные эффекты"
 L_GUI_UF_PLUGINS_AURA_WATCH_TIMER = "Таймер на отрицательных эффектах"
+L_GUI_UF_PLUGINS_PVP_DEBUFFS = "Отображать PvP дебаффы (из списка)"
 L_GUI_UF_PLUGINS_HEALCOMM = "Отображать поступающее лечение"
 L_GUI_UF_PLUGINS_AUTO_RESURRECTION = "Автовоскрешение средней кнопкой мыши (не работает с Clique)"
 
diff --git a/ShestakUI_Config/Locales/Spanish.lua b/ShestakUI_Config/Locales/Spanish.lua
index 1a36315978..7c3c1342e5 100644
--- a/ShestakUI_Config/Locales/Spanish.lua
+++ b/ShestakUI_Config/Locales/Spanish.lua
@@ -393,6 +393,7 @@ L_GUI_UF_ICONS_READY_CHECK = "Iconos de comprobación"
 L_GUI_UF_PLUGINS_DEBUFFHIGHLIGHT_ICON = "Remarcar textura de desventajas + icono"
 L_GUI_UF_PLUGINS_AURA_WATCH = "'BANDA' Ver las auras"
 L_GUI_UF_PLUGINS_AURA_WATCH_TIMER = "Temporizador en los iconos de perjuicios de la banda"
+L_GUI_UF_PLUGINS_PVP_DEBUFFS = "Show also PvP debuff icons (from the list)" -- Need review
 L_GUI_UF_PLUGINS_HEALCOMM = "Barra de sanación entrante"
 L_GUI_UF_PLUGINS_AUTO_RESURRECTION = "Auto lanzar resurreción con click central cuando la unidad este muerta (no funciona cuando Clique está activado)"
 
diff --git a/ShestakUI_Config/Locales/Taiwan.lua b/ShestakUI_Config/Locales/Taiwan.lua
index 4f24295c7a..ae149f0f50 100644
--- a/ShestakUI_Config/Locales/Taiwan.lua
+++ b/ShestakUI_Config/Locales/Taiwan.lua
@@ -393,6 +393,7 @@ L_GUI_UF_ICONS_READY_CHECK = "就緒確認標記"
 L_GUI_UF_PLUGINS_DEBUFFHIGHLIGHT_ICON = "高亮DeBuff圖示"
 L_GUI_UF_PLUGINS_AURA_WATCH = "團隊法術監視"
 L_GUI_UF_PLUGINS_AURA_WATCH_TIMER = "團隊減益時間"
+L_GUI_UF_PLUGINS_PVP_DEBUFFS = "Show also PvP debuff icons (from the list)" -- Need review
 L_GUI_UF_PLUGINS_HEALCOMM = "即將受到的治療"
 L_GUI_UF_PLUGINS_AUTO_RESURRECTION = "滑鼠中鍵點擊已死亡的角色時,自動施放復活技能(Clique啟用時無效)"
 
diff --git a/ShestakUI_Config/ShestakUI_Config.lua b/ShestakUI_Config/ShestakUI_Config.lua
index 62ba25852e..cf554294c8 100644
--- a/ShestakUI_Config/ShestakUI_Config.lua
+++ b/ShestakUI_Config/ShestakUI_Config.lua
@@ -429,6 +429,7 @@ local function Local(o)
 	if o == "UIConfigraidframeplugins_debuffhighlight_icon" then o = L_GUI_UF_PLUGINS_DEBUFFHIGHLIGHT_ICON end
 	if o == "UIConfigraidframeplugins_aura_watch" then o = L_GUI_UF_PLUGINS_AURA_WATCH end
 	if o == "UIConfigraidframeplugins_aura_watch_timer" then o = L_GUI_UF_PLUGINS_AURA_WATCH_TIMER end
+	if o == "UIConfigraidframeplugins_pvp_debuffs" then o = L_GUI_UF_PLUGINS_PVP_DEBUFFS end
 	if o == "UIConfigraidframeplugins_healcomm" then o = L_GUI_UF_PLUGINS_HEALCOMM end
 	if o == "UIConfigraidframeplugins_auto_resurrection" then o = L_GUI_UF_PLUGINS_AUTO_RESURRECTION end