diff --git a/data/images/game/floor.png b/data/images/game/floor.png
new file mode 100644
index 0000000..eb5a373
Binary files /dev/null and b/data/images/game/floor.png differ
diff --git a/data/styles/10-creaturebuttons.otui b/data/styles/10-creaturebuttons.otui
index d96356c..dc2da92 100644
--- a/data/styles/10-creaturebuttons.otui
+++ b/data/styles/10-creaturebuttons.otui
@@ -8,6 +8,7 @@ CreatureButton < UICreatureButton
     anchors.left: parent.left
     anchors.top: parent.top
     phantom: true
+    old-scaling: true
 
   UIWidget
     id: spacer
diff --git a/modules/game_outfit/outfit.lua b/modules/game_outfit/outfit.lua
index 4edc919..a72692f 100644
--- a/modules/game_outfit/outfit.lua
+++ b/modules/game_outfit/outfit.lua
@@ -103,46 +103,12 @@ function onShowFloorChange(checkBox, checked)
             local newMargin = floor:getMarginRight() + 8
             floor:setMarginRight(newMargin)
             if newMargin >= 64 then
-              for i = 1, floorTiles do
-                local sprites = {}
-                local startIndex = 1 + ((i - 1) * floorTiles)
-                local endIndex = i * floorTiles
-
-                for k = startIndex, endIndex do
-                  sprites[#sprites + 1] = floor:getChildByIndex(k):getSpriteId()
-                end
-
-                table.insert(sprites, #sprites, table.remove(sprites, 1))
-
-                local sid = 1
-                for k = startIndex, endIndex do
-                  floor:getChildByIndex(k):setSpriteId(sprites[sid])
-                  sid = sid + 1
-                end
-              end
               floor:setMarginRight(0)
             end
           elseif direction == Directions.West then
             local newMargin = floor:getMarginLeft() + 8
             floor:setMarginLeft(newMargin)
             if newMargin >= 64 then
-              for i = 1, floorTiles do
-                local sprites = {}
-                local startIndex = 1 + ((i - 1) * floorTiles)
-                local endIndex = i * floorTiles
-
-                for k = startIndex, endIndex do
-                  sprites[#sprites + 1] = floor:getChildByIndex(k):getSpriteId()
-                end
-
-                table.insert(sprites, 1, table.remove(sprites, #sprites))
-
-                local sid = 1
-                for k = startIndex, endIndex do
-                  floor:getChildByIndex(k):setSpriteId(sprites[sid])
-                  sid = sid + 1
-                end
-              end
               floor:setMarginLeft(0)
             end
           end
@@ -238,8 +204,7 @@ function create(currentOutfit, outfitList, mountList, wingList, auraList, shader
 
   floor = window.preview.panel.floor
   for i = 1, floorTiles * floorTiles do
-    local tile = g_ui.createWidget("UISprite", floor)
-    tile:setSpriteId(math.random(10057, 10064))
+    g_ui.createWidget("FloorTile", floor)
   end
   floor:hide()
 
diff --git a/modules/game_outfit/outfitwindow.otui b/modules/game_outfit/outfitwindow.otui
index 80ca999..ee7f718 100644
--- a/modules/game_outfit/outfitwindow.otui
+++ b/modules/game_outfit/outfitwindow.otui
@@ -1 +1,6 @@
+FloorTile < UIWidget
+  image-source: /images/game/floor
+  size: 32 32
+  phantom: true
+
 OutfitWindow
\ No newline at end of file
diff --git a/otclient_dx.exe b/otclient_dx.exe
index c33fbcf..8db7218 100644
Binary files a/otclient_dx.exe and b/otclient_dx.exe differ
diff --git a/otclient_gl.exe b/otclient_gl.exe
index 114a308..95cdc4e 100644
Binary files a/otclient_gl.exe and b/otclient_gl.exe differ
diff --git a/otclient_linux b/otclient_linux
index 94bdfc6..c953043 100644
Binary files a/otclient_linux and b/otclient_linux differ
diff --git a/otclient_mac b/otclient_mac
index f8211f5..c5ac901 100644
Binary files a/otclient_mac and b/otclient_mac differ
diff --git a/otclientv8.apk b/otclientv8.apk
index 9155aa2..3fbddf4 100644
Binary files a/otclientv8.apk and b/otclientv8.apk differ