diff --git a/workflow/engine/methods/setup/skin_Ajax.php b/workflow/engine/methods/setup/skin_Ajax.php
index 53c6e43b9..75e9d1df2 100755
--- a/workflow/engine/methods/setup/skin_Ajax.php
+++ b/workflow/engine/methods/setup/skin_Ajax.php
@@ -45,7 +45,14 @@ function skinList()
 {
     G::loadClass('system');
 
-    $skinListArray = System::getSkingList();
+    $skinList = System::getSkingList();
+
+    foreach ($skinList['skins'] as $key => $value) {
+        if ($value['SKIN_FOLDER_ID'] != 'simplified' && $value['SKIN_FOLDER_ID'] != 'uxs') {
+            $skinListArray['skins'][] = $value;
+        }
+    }
+    $skinListArray['currentSkin'] = $skinList['currentSkin'];
     echo G::json_encode($skinListArray);
 }
 
diff --git a/workflow/engine/templates/setup/skinList.js b/workflow/engine/templates/setup/skinList.js
index 7120997ef..036465549 100755
--- a/workflow/engine/templates/setup/skinList.js
+++ b/workflow/engine/templates/setup/skinList.js
@@ -750,7 +750,19 @@ function changeSkin(newSkin,currentSkin){
         var response = Ext.util.JSON.decode(r.responseText);
         if (response.success) {
           currentLocation = top.location.href;
-          newLocation = currentLocation.replace("/" + currentSkin + "/", "/" + newSkin + "/");
+          if (currentSkin.substring(0,2) != 'ux') {
+            if (newSkin.substring(0,2) == 'ux') {
+              newLocation = currentLocation.replace("/" + currentSkin + "/setup/", "/" + newSkin + "/");
+            } else {
+              newLocation = currentLocation.replace("/" + currentSkin + "/", "/" + newSkin + "/");
+            }
+          } else {
+            if (newSkin.substring(0,2) == 'ux') {
+              newLocation = currentLocation.replace("/" + currentSkin + "/", "/" + newSkin + "/");
+            } else {
+              newLocation = currentLocation.replace("/" + currentSkin + "/", "/" + newSkin + "/setup/");
+            }
+          }
           top.location.href = newLocation;
         }
         else {