diff --git a/AdiBags.toc b/AdiBags.toc
index 6f58536..467959e 100644
--- a/AdiBags.toc
+++ b/AdiBags.toc
@@ -21,6 +21,7 @@
 
 ## Title: AdiBags
 ## Notes: Adirelle's bag addon.
+## IconAtlas: bag-main
 ## Author: Adirelle
 ## Version: @project-version@
 ## SavedVariables: AdiBagsDB
diff --git a/AdiBags_Cata.toc b/AdiBags_Cata.toc
index bfa6658..728e1a5 100644
--- a/AdiBags_Cata.toc
+++ b/AdiBags_Cata.toc
@@ -21,6 +21,7 @@
 
 ## Title: AdiBags
 ## Notes: Adirelle's bag addon.
+## IconAtlas: bag-main
 ## Author: Adirelle
 ## Version: @project-version@
 ## SavedVariables: AdiBagsDB
diff --git a/AdiBags_Config/AdiBags_Config.toc b/AdiBags_Config/AdiBags_Config.toc
index 53c4918..1724d33 100644
--- a/AdiBags_Config/AdiBags_Config.toc
+++ b/AdiBags_Config/AdiBags_Config.toc
@@ -2,6 +2,7 @@
 
 ## Title: AdiBags Configuration
 ## Notes: Adirelle's bag addon.
+## IconAtlas: bag-main
 ## Author: Adirelle
 ## Version: @project-version@
 ## X-Date: @project-date-iso@
diff --git a/AdiBags_Config/AdiBags_Config_Cata.toc b/AdiBags_Config/AdiBags_Config_Cata.toc
index b74a857..79b8776 100644
--- a/AdiBags_Config/AdiBags_Config_Cata.toc
+++ b/AdiBags_Config/AdiBags_Config_Cata.toc
@@ -2,6 +2,7 @@
 
 ## Title: AdiBags Configuration
 ## Notes: Adirelle's bag addon.
+## IconAtlas: bag-main
 ## Author: Adirelle
 ## Version: @project-version@
 ## X-Date: @project-date-iso@
diff --git a/AdiBags_Config/AdiBags_Config_TBC.toc b/AdiBags_Config/AdiBags_Config_TBC.toc
index 9d02f0f..05ef301 100644
--- a/AdiBags_Config/AdiBags_Config_TBC.toc
+++ b/AdiBags_Config/AdiBags_Config_TBC.toc
@@ -2,6 +2,7 @@
 
 ## Title: AdiBags Configuration
 ## Notes: Adirelle's bag addon.
+## IconAtlas: bag-main
 ## Author: Adirelle
 ## Version: @project-version@
 ## X-Date: @project-date-iso@
diff --git a/AdiBags_Config/AdiBags_Config_Vanilla.toc b/AdiBags_Config/AdiBags_Config_Vanilla.toc
index 33af37d..cf13b8c 100644
--- a/AdiBags_Config/AdiBags_Config_Vanilla.toc
+++ b/AdiBags_Config/AdiBags_Config_Vanilla.toc
@@ -2,6 +2,7 @@
 
 ## Title: AdiBags Configuration
 ## Notes: Adirelle's bag addon.
+## IconAtlas: bag-main
 ## Author: Adirelle
 ## Version: @project-version@
 ## X-Date: @project-date-iso@
diff --git a/AdiBags_Config/AdiBags_Config_Wrath.toc b/AdiBags_Config/AdiBags_Config_Wrath.toc
index a896e53..6883240 100644
--- a/AdiBags_Config/AdiBags_Config_Wrath.toc
+++ b/AdiBags_Config/AdiBags_Config_Wrath.toc
@@ -2,6 +2,7 @@
 
 ## Title: AdiBags Configuration
 ## Notes: Adirelle's bag addon.
+## IconAtlas: bag-main
 ## Author: Adirelle
 ## Version: @project-version@
 ## X-Date: @project-date-iso@
diff --git a/AdiBags_TBC.toc b/AdiBags_TBC.toc
index 2c7d44d..6c0f085 100644
--- a/AdiBags_TBC.toc
+++ b/AdiBags_TBC.toc
@@ -21,6 +21,7 @@
 
 ## Title: AdiBags
 ## Notes: Adirelle's bag addon.
+## IconAtlas: bag-main
 ## Author: Adirelle
 ## Version: @project-version@
 ## SavedVariables: AdiBagsDB
diff --git a/AdiBags_Vanilla.toc b/AdiBags_Vanilla.toc
index 5752e7e..a7a4fdf 100644
--- a/AdiBags_Vanilla.toc
+++ b/AdiBags_Vanilla.toc
@@ -21,6 +21,7 @@
 
 ## Title: AdiBags
 ## Notes: Adirelle's bag addon.
+## IconAtlas: bag-main
 ## Author: Adirelle
 ## Version: @project-version@
 ## SavedVariables: AdiBagsDB
diff --git a/AdiBags_Wrath.toc b/AdiBags_Wrath.toc
index 2dd61cd..5f49b85 100644
--- a/AdiBags_Wrath.toc
+++ b/AdiBags_Wrath.toc
@@ -21,6 +21,7 @@
 
 ## Title: AdiBags
 ## Notes: Adirelle's bag addon.
+## IconAtlas: bag-main
 ## Author: Adirelle
 ## Version: @project-version@
 ## SavedVariables: AdiBagsDB
diff --git a/modules/DataSource.lua b/modules/DataSource.lua
index 105e387..bdb796f 100644
--- a/modules/DataSource.lua
+++ b/modules/DataSource.lua
@@ -24,7 +24,10 @@ local L = addon.L
 
 --<GLOBALS
 local _G = _G
+local AddonCompartmentFrame = _G.AddonCompartmentFrame
 local format = _G.format
+local GameTooltip = _G.GameTooltip
+local GetAddOnMetadata = _G.C_AddOns.GetAddOnMetadata
 local GetContainerNumFreeSlots = C_Container and _G.C_Container.GetContainerNumFreeSlots or _G.GetContainerNumFreeSlots
 local GetContainerNumSlots = C_Container and _G.C_Container.GetContainerNumSlots or _G.GetContainerNumSlots
 local ipairs = _G.ipairs
@@ -41,18 +44,31 @@ mod.uiName = L['LDB Plugin']
 mod.uiDesc = L['Provides a LDB data source to be displayed by LDB display addons.']
 mod.cannotDisable = true
 
-local dataobj = {
-	type = 'data source',
+local dataObject = {
+	type = "data source",
 	label = addonName,
 	text = addonName,
 	icon = [[Interface\Buttons\Button-Backpack-Up]],
-	OnClick = function(_, button)
-		if button == "RightButton" then
+	OnClick = function(_, mouseButton)
+		mouseButton = mouseButton.buttonName or mouseButton
+		if mouseButton == "RightButton" then
 			addon:OpenOptions()
 		else
-			addon:OpenAllBags()
+			addon:ToggleBackpack()
 		end
 	end,
+	OnEnter = function(self)
+		local r, g, b = 0.2, 1, 0.2
+		GameTooltip:SetOwner(self, "ANCHOR_LEFT")
+		GameTooltip:AddDoubleLine(addonName, GetAddOnMetadata(addonName, "Version"))
+		GameTooltip:AddLine(" ")
+		GameTooltip:AddLine(L["|cFFEDA55FLeft-click|r to toggle bags."], r, g, b)
+		GameTooltip:AddLine(L["|cFFEDA55FRight-click|r to toggle options."], r, g, b)
+		GameTooltip:Show()
+	end,
+	OnLeave = function()
+		GameTooltip:Hide()
+	end,
 }
 
 function mod:OnInitialize()
@@ -70,7 +86,21 @@ end
 local created = false
 function mod:OnEnable()
 	if not created then
-		LibStub('LibDataBroker-1.1'):NewDataObject(addonName, dataobj)
+		-- Addon compartment:
+		-- https://warcraft.wiki.gg/wiki/Addon_compartment
+		if AddonCompartmentFrame then
+			AddonCompartmentFrame:RegisterAddon({
+				text = addonName,
+				icon = dataObject.icon,
+				func = dataObject.OnClick,
+				funcOnEnter = dataObject.OnEnter,
+				funcOnLeave = dataObject.OnLeave,
+				registerForAnyClick = true,
+				notCheckable = true,
+			})
+		end
+
+		LibStub('LibDataBroker-1.1'):NewDataObject(addonName, dataObject)
 		created = true
 	end
 	self:RegisterBucketEvent('BAG_UPDATE', 0.5, "Update")
@@ -172,9 +202,9 @@ end
 function mod:Update(event)
 	local bags = BuildSpaceString(addon.BAG_IDS.BAGS)
 	if self.atBank and self.db.profile.showBank then
-		dataobj.text = format("%s |cff7777ff%s|r", bags, BuildSpaceString(addon.BAG_IDS.BANK))
+		dataObject.text = format("%s |cff7777ff%s|r", bags, BuildSpaceString(addon.BAG_IDS.BANK))
 	else
-		dataobj.text = bags
+		dataObject.text = bags
 	end
 end