diff --git a/Assets/All_Characters.blp b/Assets/All_Characters.blp
new file mode 100644
index 0000000..7577fe6
Binary files /dev/null and b/Assets/All_Characters.blp differ
diff --git a/Assets/All_Characters.png b/Assets/All_Characters.png
deleted file mode 100644
index fae1f5c..0000000
Binary files a/Assets/All_Characters.png and /dev/null differ
diff --git a/Assets/Bags.png b/Assets/Bags.png
deleted file mode 100644
index 8f3c1ca..0000000
Binary files a/Assets/Bags.png and /dev/null differ
diff --git a/Assets/Chest.blp b/Assets/Chest.blp
new file mode 100644
index 0000000..b879e7a
Binary files /dev/null and b/Assets/Chest.blp differ
diff --git a/Assets/Chest.png b/Assets/Chest.png
deleted file mode 100644
index b85b37a..0000000
Binary files a/Assets/Chest.png and /dev/null differ
diff --git a/Assets/Cog.blp b/Assets/Cog.blp
new file mode 100644
index 0000000..1b25330
Binary files /dev/null and b/Assets/Cog.blp differ
diff --git a/Assets/Cog.png b/Assets/Cog.png
deleted file mode 100644
index 1005706..0000000
Binary files a/Assets/Cog.png and /dev/null differ
diff --git a/Assets/Sorting.blp b/Assets/Sorting.blp
new file mode 100644
index 0000000..0c2d1d5
Binary files /dev/null and b/Assets/Sorting.blp differ
diff --git a/Assets/Sorting.png b/Assets/Sorting.png
deleted file mode 100644
index 37cc6e7..0000000
Binary files a/Assets/Sorting.png and /dev/null differ
diff --git a/UI/BagFrame.xml b/UI/BagFrame.xml
index d41c60d..8f97f90 100644
--- a/UI/BagFrame.xml
+++ b/UI/BagFrame.xml
@@ -89,8 +89,8 @@
                     <OnLoad>
                         local icon = getglobal(this:GetName().."_Icon")
                         if icon then
-                            icon:SetTexture("Interface\\Icons\\Trade_Engineering")
-                            icon:SetTexCoord(0.08, 0.92, 0.08, 0.92)
+                            icon:SetTexture("Interface\\AddOns\\Guda\\Assets\\Cog")
+                            icon:SetTexCoord(0, 1, 0, 1)
                         end
                     </OnLoad>
                     <OnClick>
@@ -136,8 +136,9 @@
                     <OnLoad>
                         local icon = getglobal(this:GetName().."_Icon")
                         if icon then
-                            icon:SetTexture("Interface\\Icons\\INV_Misc_Note_01")
-                            icon:SetTexCoord(0.08, 0.92, 0.08, 0.92)
+                            -- BagShui approach: no file extension, WoW finds .blp automatically
+                            icon:SetTexture("Interface\\AddOns\\Guda\\Assets\\Sorting")
+                            icon:SetTexCoord(0, 1, 0, 1)
                         end
                     </OnLoad>
                     <OnClick>
@@ -232,8 +233,8 @@
                     <OnLoad>
                         local icon = getglobal(this:GetName().."_Icon")
                         if icon then
-                            icon:SetTexture("Interface\\Icons\\INV_Misc_Bag_13")
-                            icon:SetTexCoord(0.08, 0.92, 0.08, 0.92)
+                            icon:SetTexture("Interface\\AddOns\\Guda\\Assets\\Chest")
+                            icon:SetTexCoord(0, 1, 0, 1)
                         end
                     </OnLoad>
                     <OnClick>
diff --git a/UI/BankFrame.lua b/UI/BankFrame.lua
index b31b839..6407ab9 100644
--- a/UI/BankFrame.lua
+++ b/UI/BankFrame.lua
@@ -568,22 +568,22 @@ function BankFrame:CreateGudaButtonOnBlizzardUI()
 
     -- Create the button next to close button
     local gudaButton = CreateFrame("Button", "BankFrame_GudaButton", blizzardBankFrame)
-    gudaButton:SetWidth(15)
-    gudaButton:SetHeight(15)
+    gudaButton:SetWidth(20)
+    gudaButton:SetHeight(20)
     
     -- Position next to close button (to the left of it)
     local closeButton = getglobal("BankFrameCloseButton")
     if closeButton then
         gudaButton:SetPoint("RIGHT", closeButton, "LEFT", -2, 0)
     else
-        gudaButton:SetPoint("TOPRIGHT", blizzardBankFrame, "TOPRIGHT", -61, -17)
+        gudaButton:SetPoint("TOPRIGHT", blizzardBankFrame, "TOPRIGHT", -61, -14)
     end
 
     -- Create button texture
     local texture = gudaButton:CreateTexture(nil, "ARTWORK")
     texture:SetAllPoints(gudaButton)
-    texture:SetTexture("Interface\\Icons\\INV_Misc_Bag_08")
-    texture:SetTexCoord(0.08, 0.92, 0.08, 0.92)
+    texture:SetTexture("Interface\\AddOns\\Guda\\Assets\\Chest")
+    texture:SetTexCoord(0, 1, 0, 1)
 
     -- Create highlight texture
     local highlight = gudaButton:CreateTexture(nil, "HIGHLIGHT")
diff --git a/UI/BankFrame.xml b/UI/BankFrame.xml
index b161aeb..58223fb 100644
--- a/UI/BankFrame.xml
+++ b/UI/BankFrame.xml
@@ -89,8 +89,9 @@
                     <OnLoad>
                         local icon = getglobal(this:GetName().."_Icon")
                         if icon then
-                            icon:SetTexture("Interface\\Icons\\INV_Misc_Note_01")
-                            icon:SetTexCoord(0.08, 0.92, 0.08, 0.92)
+                            -- BagShui approach: no file extension, WoW finds .blp automatically
+                            icon:SetTexture("Interface\\AddOns\\Guda\\Assets\\Sorting")
+                            icon:SetTexCoord(0, 1, 0, 1)
                         end
                     </OnLoad>
                     <OnClick>
@@ -136,8 +137,8 @@
                     <OnLoad>
                         local icon = getglobal(this:GetName().."_Icon")
                         if icon then
-                            icon:SetTexture("Interface\\Icons\\Trade_Engineering")
-                            icon:SetTexCoord(0.08, 0.92, 0.08, 0.92)
+                            icon:SetTexture("Interface\\AddOns\\Guda\\Assets\\Cog")
+                            icon:SetTexCoord(0, 1, 0, 1)
                         end
                     </OnLoad>
                     <OnClick>
@@ -183,8 +184,8 @@
                     <OnLoad>
                         local icon = getglobal(this:GetName().."_Icon")
                         if icon then
-                            icon:SetTexture("Interface\\Icons\\INV_Misc_Bag_08")
-                            icon:SetTexCoord(0.08, 0.92, 0.08, 0.92)
+                            icon:SetTexture("Interface\\AddOns\\Guda\\Assets\\Chest")
+                            icon:SetTexCoord(0, 1, 0, 1)
                         end
                     </OnLoad>
                     <OnClick>