diff --git a/workflow/engine/methods/setup/skin_Ajax.php b/workflow/engine/methods/setup/skin_Ajax.php
index 58cacc255..d19c6c5a9 100755
--- a/workflow/engine/methods/setup/skin_Ajax.php
+++ b/workflow/engine/methods/setup/skin_Ajax.php
@@ -45,25 +45,33 @@ function skinList ()
     G::loadClass( 'system' );
 
     $skinList = System::getSkingList();
-
     $wildcard = '';
     if (isset( $_REQUEST['activeskin'] )) {
         $wildcard = '@';
     }
+    
+    $classicSkin = '';
+    if (defined('PARTNER_FLAG')) {
+        $classicSkin = '00000000000000000000000000000001';
+    }
+    
     foreach ($skinList['skins'] as $key => $value) {
-        if ($value['SKIN_FOLDER_ID'] != 'simplified' && $value['SKIN_FOLDER_ID'] != 'uxs' && $value['SKIN_FOLDER_ID'] != 'uxmodern') {
-            if ($skinList['currentSkin'] == $value['SKIN_FOLDER_ID']) {
-                $value['SKIN_STATUS'] = $wildcard . G::LoadTranslation( 'ID_ACTIVE' );
-                $value['SKIN_NAME'] = $wildcard . $value['SKIN_NAME'];
-                $value['SKIN_WORKSPACE'] = $wildcard . $value['SKIN_WORKSPACE'];
-                $value['SKIN_DESCRIPTION'] = $wildcard . $value['SKIN_DESCRIPTION'];
-                $value['SKIN_AUTHOR'] = $wildcard . $value['SKIN_AUTHOR'];
-                $value['SKIN_CREATEDATE'] = $wildcard . $value['SKIN_CREATEDATE'];
-                $value['SKIN_MODIFIEDDATE'] = $wildcard . $value['SKIN_MODIFIEDDATE'];
-            } else {
-                $value['SKIN_STATUS'] = G::LoadTranslation( 'ID_INACTIVE' );
+        if ($value['SKIN_ID'] != $classicSkin) {
+            if ($value['SKIN_FOLDER_ID'] != 'simplified' && $value['SKIN_FOLDER_ID'] != 'uxs' && $value['SKIN_FOLDER_ID'] != 'uxmodern') {
+                if ($skinList['currentSkin'] == $value['SKIN_FOLDER_ID']) {
+                    $value['SKIN_STATUS'] = $wildcard . G::LoadTranslation( 'ID_ACTIVE' );
+                    $value['SKIN_NAME'] = $wildcard . $value['SKIN_NAME'];
+                    $value['SKIN_WORKSPACE'] = $wildcard . $value['SKIN_WORKSPACE'];
+                    $value['SKIN_DESCRIPTION'] = $wildcard . $value['SKIN_DESCRIPTION'];
+                    $value['SKIN_AUTHOR'] = $wildcard . $value['SKIN_AUTHOR'];
+                    $value['SKIN_CREATEDATE'] = $wildcard . $value['SKIN_CREATEDATE'];
+                    $value['SKIN_MODIFIEDDATE'] = $wildcard . $value['SKIN_MODIFIEDDATE'];
+                } else {
+                    $value['SKIN_STATUS'] = G::LoadTranslation( 'ID_INACTIVE' );
+                }
+                
+                $skinListArray['skins'][] = $value;
             }
-            $skinListArray['skins'][] = $value;
         }
     }
     $skinListArray['currentSkin'] = $skinList['currentSkin'];
diff --git a/workflow/engine/templates/setup/skinList.js b/workflow/engine/templates/setup/skinList.js
index cdf40f906..5d43f5e1a 100755
--- a/workflow/engine/templates/setup/skinList.js
+++ b/workflow/engine/templates/setup/skinList.js
@@ -132,7 +132,13 @@ Ext.onReady(function(){
         rowSelected = infoGrid.getSelectionModel().getSelected();
         if((rowSelected.data.SKIN_FOLDER_ID)&&((rowSelected.data.SKIN_FOLDER_ID!="classic"))){
           exportButton.enable();
-          deleteButton.enable();
+          
+          if (rowSelected.data.SKIN_STATUS!='Inactive') {
+            deleteButton.disable();
+          } else {
+            deleteButton.enable();
+          }
+
         }else{
           exportButton.disable();
           deleteButton.disable();
@@ -363,6 +369,7 @@ showdate = function (value){
 
 selectedSkin = function (value){
     if(gotWildCard(value)){
+        deleteButton.disable();
         return setBoldItalic(value.substring(1));
     }
     return value;