5.1.15

diff --git a/Interface/AddOns/SVUI/system/docks.lua b/Interface/AddOns/SVUI/system/docks.lua
index 6f74c1a..b854ca3 100644
--- a/Interface/AddOns/SVUI/system/docks.lua
+++ b/Interface/AddOns/SVUI/system/docks.lua
@@ -558,10 +558,8 @@ function Dock:CreateDockPanels()
 	self:ActivateDockletButton(self.Right.Button, SV.ToggleHenchman)
 	self:ActivateDockletButton(self.Right.ToolBar.AddonButton, AddonDockletToggle)

-	SV.Mentalo:Add(self.Left.BarHolder, L["Left Dock Buttons"])
-	SV.Mentalo:Add(self.Left.Window, L["Left Dock Window"])
-	SV.Mentalo:Add(self.Right.BarHolder, L["Right Dock Buttons"])
-	SV.Mentalo:Add(self.Right.Window, L["Right Dock Window"])
+	SV.Mentalo:Add(self.Left, L["Left Dock Window"])
+	SV.Mentalo:Add(self.Right, L["Right Dock Window"])
 	SV:AddToDisplayAudit(self.Right.Window)

 	if SV.cache.Docks.IsFaded then Dock.Left:Hide() Dock.Right:Hide() end
@@ -729,7 +727,11 @@ do
 			button:SetAttribute("macrotext", "/cast " .. proName)
 		end

-		Dock:ActivateDockletButton(button, nil, SetMacroTooltip)
+		button.CustomTooltip = SetMacroTooltip
+		button:SetPanelColor("default")
+		button.Icon:SetGradient(unpack(SV.Media.gradient.icon))
+		button:SetScript("OnEnter", DockletButton_OnEnter)
+		button:SetScript("OnLeave", DockletButton_OnLeave)
 	end

 	function Dock:LoadToolBarProfessions()
@@ -746,7 +748,11 @@ do
 		hearth:SetAttribute("type", "item")
 		hearth:SetAttribute("item", "Hearthstone")

-		Dock:ActivateDockletButton(hearth, nil, SetHearthTooltip)
+		hearth.CustomTooltip = SetHearthTooltip
+		hearth:SetPanelColor("default")
+		hearth.Icon:SetGradient(unpack(SV.Media.gradient.icon))
+		hearth:SetScript("OnEnter", DockletButton_OnEnter)
+		hearth:SetScript("OnLeave", DockletButton_OnLeave)

 		for i = 1, #HEARTH_SPELLS do
 			if(IsSpellKnown(HEARTH_SPELLS[i])) then
@@ -896,7 +902,7 @@ function Dock:RegisterMainDocklet(name)
 		frame:ClearAllPoints()
 		frame:SetParent(addonDock1)
 		frame:SetAllPoints(addonDock1)
-		frame.ToggleName = "Dock.RightToolBarAddonButton";
+		frame.ToggleName = "SVUI_DockRightToolBarAddonButton";
 		tinsert(self.DockletWindows, frame);
 		frame.listIndex = #self.DockletWindows;
 		AddTool(self.Right.ToolBar.AddonButton)
@@ -915,7 +921,7 @@ function Dock:RegisterExtraDocklet(name)
 		frame:ClearAllPoints()
 		frame:SetParent(addonDock2)
 		frame:SetAllPoints(addonDock2)
-		frame.ToggleName = "Dock.RightToolBarAddonButton";
+		frame.ToggleName = "SVUI_DockRightToolBarAddonButton";
 		tinsert(self.DockletWindows, frame);
 		frame.listIndex = #self.DockletWindows;
 		self.Right.ToolBar.AddonButton:SetAttribute("tipText", "")
diff --git a/Interface/AddOns/SVUI/xml/framework.xml b/Interface/AddOns/SVUI/xml/framework.xml
index 1374f2f..3a9faf6 100644
--- a/Interface/AddOns/SVUI/xml/framework.xml
+++ b/Interface/AddOns/SVUI/xml/framework.xml
@@ -3,7 +3,6 @@
         <Size x="22" y="22"/>
         <Attributes>
             <Attribute name="tipText" type="string" value="" />
-            <Attribute name="tipExtraText" type="string" value="" />
             <Attribute name="ownerFrame" type="string" value="None" />
             <Attribute name="isActive" type="boolean" value="false" />
         </Attributes>
@@ -35,17 +34,10 @@
             <Anchor point="BOTTOMLEFT" />
         </Anchors>
         <Frames>
-            <Frame name="$parentBarHolder" parentKey="BarHolder">
-                <Size y="22"/>
-                <Anchors>
-                    <Anchor point="BOTTOMLEFT" relativeTo="$parent" relativePoint="BOTTOMLEFT" x="0" y="0" />
-                    <Anchor point="BOTTOMRIGHT" relativeTo="$parent" relativePoint="BOTTOMRIGHT" x="0" y="0" />
-                </Anchors>
-            </Frame>
             <Button name="$parentButton" parentKey="Button">
                 <Size x="22" y="22"/>
                 <Anchors>
-                    <Anchor point="BOTTOMLEFT" relativeTo="$parent" relativePoint="BOTTOMLEFT" />
+                    <Anchor point="BOTTOMLEFT" relativeTo="UIParent" relativePoint="BOTTOMLEFT" />
                 </Anchors>
                 <Attributes>
                     <Attribute name="tipText" type="string" value="" />
@@ -74,14 +66,16 @@
             <Frame name="$parentAlert" parentKey="Alert" frameStrata="BACKGROUND">
                 <Size y="1"/>
                 <Anchors>
-                    <Anchor point="BOTTOMLEFT" relativeTo="$parent" relativePoint="TOPLEFT" x="0" y="4" />
-                    <Anchor point="BOTTOMRIGHT" relativeTo="$parent" relativePoint="TOPRIGHT" x="0" y="4" />
+                    <Anchor point="BOTTOMLEFT" relativeTo="$parentButton" relativePoint="TOPLEFT" x="0" y="4" />
+                    <Anchor point="BOTTOMRIGHT" relativeTo="$parentToolBar" relativePoint="TOPRIGHT" x="0" y="4" />
                 </Anchors>
             </Frame>
             <Frame name="$parentWindow" parentKey="Window" frameStrata="BACKGROUND">
                 <Anchors>
+                    <Anchor point="BOTTOMRIGHT" relativeTo="$parentAlert" relativePoint="TOPRIGHT" x="0" y="4" />
                     <Anchor point="BOTTOMLEFT" relativeTo="$parentAlert" relativePoint="TOPLEFT" x="0" y="4" />
-                    <Anchor point="TOPRIGHT" relativeTo="$parent" relativePoint="TOPRIGHT" x="0" y="4" />
+                    <Anchor point="TOPLEFT" relativeTo="$parent" relativePoint="TOPLEFT" x="0" y="0" />
+                    <Anchor point="TOPRIGHT" relativeTo="$parent" relativePoint="TOPRIGHT" x="0" y="0" />
                 </Anchors>
             </Frame>
         </Frames>
@@ -96,17 +90,10 @@
             <Anchor point="BOTTOMRIGHT" />
         </Anchors>
         <Frames>
-            <Frame name="$parentBarHolder" parentKey="BarHolder">
-                <Size y="22"/>
-                <Anchors>
-                    <Anchor point="BOTTOMLEFT" relativeTo="$parent" relativePoint="BOTTOMLEFT" x="0" y="0" />
-                    <Anchor point="BOTTOMRIGHT" relativeTo="$parent" relativePoint="BOTTOMRIGHT" x="0" y="0" />
-                </Anchors>
-            </Frame>
             <Button name="$parentButton" parentKey="Button">
                 <Size x="22" y="22"/>
                 <Anchors>
-                    <Anchor point="BOTTOMRIGHT" relativeTo="$parent" relativePoint="BOTTOMRIGHT" />
+                    <Anchor point="BOTTOMRIGHT" relativeTo="UIParent" relativePoint="BOTTOMRIGHT" />
                 </Anchors>
                 <Attributes>
                     <Attribute name="tipText" type="string" value="" />
@@ -159,14 +146,16 @@
             <Frame name="$parentAlert" parentKey="Alert" frameStrata="BACKGROUND">
                 <Size y="1"/>
                 <Anchors>
-                    <Anchor point="BOTTOMRIGHT" relativeTo="$parent" relativePoint="TOPRIGHT" x="0" y="4" />
-                    <Anchor point="BOTTOMLEFT" relativeTo="$parent" relativePoint="TOPLEFT" x="0" y="4" />
+                    <Anchor point="BOTTOMRIGHT" relativeTo="$parentButton" relativePoint="TOPRIGHT" x="0" y="4" />
+                    <Anchor point="BOTTOMLEFT" relativeTo="$parentToolBar" relativePoint="TOPLEFT" x="0" y="4" />
                 </Anchors>
             </Frame>
             <Frame name="$parentWindow" parentKey="Window" frameStrata="BACKGROUND">
                 <Anchors>
                     <Anchor point="BOTTOMRIGHT" relativeTo="$parentAlert" relativePoint="TOPRIGHT" x="0" y="4" />
+                    <Anchor point="BOTTOMLEFT" relativeTo="$parentAlert" relativePoint="TOPLEFT" x="0" y="4" />
                     <Anchor point="TOPLEFT" relativeTo="$parent" relativePoint="TOPLEFT" x="0" y="0" />
+                    <Anchor point="TOPRIGHT" relativeTo="$parent" relativePoint="TOPRIGHT" x="0" y="0" />
                 </Anchors>
             </Frame>
         </Frames>