diff --git a/data/images/ui/rotate_button.png b/data/images/ui/rotate_button.png
index 043fcee..85ea797 100644
Binary files a/data/images/ui/rotate_button.png and b/data/images/ui/rotate_button.png differ
diff --git a/data/styles/40-outfitwindow.otui b/data/styles/40-outfitwindow.otui
index 8d0dbd9..b82f504 100644
--- a/data/styles/40-outfitwindow.otui
+++ b/data/styles/40-outfitwindow.otui
@@ -258,7 +258,7 @@ OutfitWindow < MainWindow
         size: 128 128
         margin-right: 32
         margin-bottom: 32
-        outfit-shader: default
+        outfit-shader: outfit_default
       
       Panel
         id: bars
diff --git a/layouts/retro/styles/40-outfitwindow.otui b/layouts/retro/styles/40-outfitwindow.otui
index bf2c21b..4904312 100644
--- a/layouts/retro/styles/40-outfitwindow.otui
+++ b/layouts/retro/styles/40-outfitwindow.otui
@@ -258,7 +258,7 @@ OutfitWindow < MainWindow
         size: 128 128
         margin-right: 32
         margin-bottom: 32
-        outfit-shader: default
+        outfit-shader: outfit_default
       
       Panel
         id: bars
diff --git a/modules/game_outfit/outfit.lua b/modules/game_outfit/outfit.lua
index d3e3faa..af0af63 100644
--- a/modules/game_outfit/outfit.lua
+++ b/modules/game_outfit/outfit.lua
@@ -218,7 +218,7 @@ function create(currentOutfit, outfitList, mountList, wingList, auraList, shader
   end
 
   if currentOutfit.shader == "" then
-    currentOutfit.shader = "default"
+    currentOutfit.shader = "outfit_default"
   end
 
   loadSettings()
@@ -618,7 +618,7 @@ function showOutfits()
     outfit.mount = 0
     outfit.aura = 0
     outfit.wings = 0
-    outfit.shader = "default"
+    outfit.shader = "outfit_default"
     outfit.healthBar = 0
     outfit.manaBar = 0
     button.outfit:setOutfit(outfit)
@@ -777,12 +777,12 @@ function showShaders()
   local focused = nil
   do
     local button = g_ui.createWidget("SelectionButton", window.selectionList)
-    button:setId("default")
+    button:setId("outfit_default")
 
-    button.outfit:setOutfit({type = tempOutfit.type, addons = tempOutfit.addons, shader = "default"})
+    button.outfit:setOutfit({type = tempOutfit.type, addons = tempOutfit.addons, shader = "outfit_default"})
     button.name:setText("None")
-    if tempOutfit.shader == "default" then
-      focused = "default"
+    if tempOutfit.shader == "outfit_default" then
+      focused = "outfit_default"
     end
   end
 
@@ -1118,7 +1118,9 @@ function updatePreview()
   local previewOutfit = table.copy(tempOutfit)
 
   if not settings.showOutfit then
-    previewOutfit.type = 0
+    previewCreature:hide()
+  else
+    previewCreature:show()
   end
 
   if not settings.showMount then
@@ -1134,7 +1136,7 @@ function updatePreview()
   end
 
   if not settings.showShader then
-    previewOutfit.shader = "default"
+    previewOutfit.shader = "outfit_default"
   end
 
   if not settings.showBars then
diff --git a/otclient_dx.exe b/otclient_dx.exe
index a7a3dc9..a2c8811 100644
Binary files a/otclient_dx.exe and b/otclient_dx.exe differ
diff --git a/otclient_gl.exe b/otclient_gl.exe
index e3d1562..3b8810a 100644
Binary files a/otclient_gl.exe and b/otclient_gl.exe differ
diff --git a/otclient_linux b/otclient_linux
index eeb5391..5d437c9 100644
Binary files a/otclient_linux and b/otclient_linux differ
diff --git a/otclient_mac b/otclient_mac
index 60eda7d..14eb6b7 100644
Binary files a/otclient_mac and b/otclient_mac differ
diff --git a/otclientv8.apk b/otclientv8.apk
index 10ec72c..c46d67c 100644
Binary files a/otclientv8.apk and b/otclientv8.apk differ