5.1.31

diff --git a/Interface/AddOns/SVUI/packages/unit/groups.lua b/Interface/AddOns/SVUI/packages/unit/groups.lua
index fd30445..281cbe3 100644
--- a/Interface/AddOns/SVUI/packages/unit/groups.lua
+++ b/Interface/AddOns/SVUI/packages/unit/groups.lua
@@ -242,8 +242,8 @@ local PartyVisibility = function(self, event)
         if(instance and instanceType == "raid") then
             UnregisterStateDriver(self,"visibility")
             self:Hide()
-        elseif(db.visibility) then
-            RegisterStateDriver(self, "visibility", db.visibility)
+        else
+            RegisterStateDriver(self, "visibility", "[group:raid][nogroup] hide;show")
         end
     else
         self:RegisterEvent("PLAYER_REGEN_ENABLED")
@@ -435,8 +435,8 @@ local RaidVisibility = {
                 else
                     self:Hide()
                 end
-            elseif(db.visibility) then
-                RegisterStateDriver(self, "visibility", db.visibility)
+            else
+                RegisterStateDriver(self, "visibility", "[@raid6, noexists][@raid11, exists][nogroup] hide;show")
             end
         else
             self:RegisterEvent("PLAYER_REGEN_ENABLED")
@@ -461,8 +461,8 @@ local RaidVisibility = {
                 else
                     self:Hide()
                 end
-            elseif(db.visibility) then
-                RegisterStateDriver(self, "visibility", db.visibility)
+            else
+                RegisterStateDriver(self, "visibility", "[@raid11, noexists][@raid26, exists][nogroup] hide;show")
             end
         else
             self:RegisterEvent("PLAYER_REGEN_ENABLED")
@@ -487,8 +487,8 @@ local RaidVisibility = {
                 else
                     self:Hide()
                 end
-            elseif(db.visibility) then
-                RegisterStateDriver(self, "visibility", db.visibility)
+            else
+                RegisterStateDriver(self, "visibility", "[@raid26, noexists][nogroup] hide;show")
             end
         else
             self:RegisterEvent("PLAYER_REGEN_ENABLED")
diff --git a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/guild.lua b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/guild.lua
index e8ffd69..bca79a1 100644
--- a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/guild.lua
+++ b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/guild.lua
@@ -679,14 +679,7 @@ local function GuildFrameStyle()
 		local button = _G["GuildRewardsContainerButton"..i]
 		if button then
 			button:RemoveTextures()
-			button:SetFixedPanelTemplate("Button")
-			if button.icon then
-				button.icon:SetTexCoord(0.1, 0.9, 0.1, 0.9)
-				button.icon:ClearAllPoints()
-				button.icon:Point("TOPLEFT", button, "TOPLEFT", 2, -2)
-				button.Panel:WrapOuter(button.icon)
-				button.icon:SetParent(button.Panel)
-			end
+			PLUGIN:ApplyItemButtonStyle(button)
 		end
 	end