diff --git a/AtlasLoot.toc b/AtlasLoot.toc
index c85cfe9..f86c62d 100644
--- a/AtlasLoot.toc
+++ b/AtlasLoot.toc
@@ -3,7 +3,7 @@
 ## Notes: Shows possible loot from dungeon bosses and other sources.
 ## Author: Otari (overhaul/revamp, menu changes, bugfixes/updates), Lexie (Turtle WoW fixes/updates), Pepopo, MarcelineVQ (Kara40 loot), Shagu
 ## LegacyAuthor: Daviesh, Pompa (Turtle WoW World Bosses), Xerron (Turtle WoW World Bosses), Gurky (Turtle WoW 1.16/1.16.1 Dungeons)
-## Version: 3.4.3
+## Version: 3.4.4
 ## SavedVariablesPerCharacter: AtlasLootCharDB
 ## OptionalDeps: Alphamap, AtlasLoader, LootLink, ItemSync, HewdropLib, Ace2, EquipCompare, EQCompare
 
diff --git a/Core/AtlasLoot.lua b/Core/AtlasLoot.lua
index 9e2a3b3..bb1079f 100644
--- a/Core/AtlasLoot.lua
+++ b/Core/AtlasLoot.lua
@@ -798,6 +798,8 @@ function AtlasLoot_ShowItemsFrame(dataID, dataSource, title)
 				extraFrame       = _G["AtlasLootItem_"..i.."_Extra"]
 				local quantity   = _G["AtlasLootItem_"..i.."_Quantity"]
 				local iconBorder = _G["AtlasLootItem_"..i.."_IconBorder"]
+				local containerBorder = _G["AtlasLootItem_"..i.."_ContainerBorder"]
+				local containerHighlight = _G["AtlasLootItem_"..i.."_ContainerBorderHighlight"]
 				iconBorder:SetVertexColor(1, 1, 1)
 				if string.sub(dataSource[dataID][i][1], 1, 1) == "s" then
 					isItem = false
@@ -1014,12 +1016,16 @@ function AtlasLoot_ShowItemsFrame(dataID, dataSource, title)
 				itemButton.itemIDExtra = dataSource[dataID][i][4]
 				itemButton.container = dataSource[dataID][i][7]
 				if type(itemButton.container) == "table" then
-					iconBorder:SetVertexColor(1, 0.82, 0)
+					containerBorder:Show()
+					containerHighlight:Show()
 					for row = 1, getn(itemButton.container) do
 						for item = 1, getn(itemButton.container[row]) do
 							AtlasLoot_CacheItem(itemButton.container[row][item][1])
 						end
 					end
+				else
+					containerHighlight:Hide()
+					containerBorder:Hide()
 				end
 				itemButton.droprate = nil
 				if dataID == "SearchResult" or dataID == "WishList" then
diff --git a/Core/AtlasLoot.xml b/Core/AtlasLoot.xml
index e86b9c0..f807efd 100644
--- a/Core/AtlasLoot.xml
+++ b/Core/AtlasLoot.xml
@@ -447,7 +447,7 @@
 		<Size x="236" y="28"/>
 		<HighlightTexture file="Interface\QuestFrame\UI-QuestTitleHighlight" alphaMode="ADD"/>
 		<Layers>
-			<Layer level="ARTWORK">
+			<Layer level="BACKGROUND">
 				<Texture name="$parent_Icon">
 					<Size x="27" y="27"/>
 					<Anchors>
@@ -456,6 +456,15 @@
 						</Anchor>
 					</Anchors>
 				</Texture>
+			</Layer>
+			<Layer level="ARTWORK">
+				<Texture name="$parent_IconBorder" file="Interface\AddOns\AtlasLoot\Images\border">
+					<Size x="33" y="33"/>
+					<Anchors>
+						<Anchor point="CENTER" relativeTo="$parent_Icon"/>
+					</Anchors>
+					<Color r="1" g="1" b="1" a="1"/>
+				</Texture>
 				<FontString name="$parent_Quantity" font="Fonts\ARIALN.TTF" outline="NORMAL" justifyH="RIGHT">
 					<Size x="30" y="14"/>
 					<FontHeight val="12"/>
@@ -559,22 +568,25 @@
 					<TexCoords left="0.078125" right="0.90625" top="0.078125" bottom="0.90625"/>
 				</Texture>
 			</Layer>
-			<Layer level="BACKGROUND">
-				<Texture name="$parent_Unsafe" hidden="true">
-					<Size x="27" y="27"/>
+			<Layer level="OVERLAY">
+				<Texture name="$parent_ContainerBorder" file="Interface\Buttons\UI-AutoCastableOverlay" hidden="true">
+					<Size x="42" y="42"/>
 					<Anchors>
-						<Anchor point="TOPLEFT"/>
+						<Anchor point="CENTER" relativeTo="$parent_Icon">
+							<Offset x="-11" y="-12"/>
+						</Anchor>
 					</Anchors>
-					<Color r="1" g="0" b="0" a="1"/>
+					<TexCoords left="0" right="0.5" top="0.5" bottom="1"/>
 				</Texture>
 			</Layer>
-			<Layer level="OVERLAY">
-				<Texture name="$parent_IconBorder" file="Interface\AddOns\AtlasLoot\Images\border">
-					<Size x="33" y="33"/>
+			<Layer level="HIGHLIGHT">
+				<Texture name="$parent_ContainerBorderHighlight" file="Interface\Buttons\UI-AutoCastableOverlay" alphaMode="ADD" hidden="true">
+					<Size x="44" y="44"/>
 					<Anchors>
-						<Anchor point="CENTER" relativeTo="$parent_Icon"/>
+						<Anchor point="CENTER" relativeTo="$parent_ContainerBorder">
+						</Anchor>
 					</Anchors>
-					<Color r="1" g="1" b="1" a="1"/>
+					<TexCoords left="0" right="0.5" top="0.5" bottom="1"/>
 				</Texture>
 			</Layer>
 		</Layers>