diff --git a/workflow/engine/methods/setup/skin_Ajax.php b/workflow/engine/methods/setup/skin_Ajax.php
index 8bf9c2acc..0d4658561 100755
--- a/workflow/engine/methods/setup/skin_Ajax.php
+++ b/workflow/engine/methods/setup/skin_Ajax.php
@@ -49,16 +49,17 @@ function skinList()
 
     foreach ($skinList['skins'] as $key => $value) {
         if ($value['SKIN_FOLDER_ID'] != 'simplified' && $value['SKIN_FOLDER_ID'] != 'uxs') {
-            if($skinList['currentSkin']==$value['SKIN_FOLDER_ID']){ 
-                $value['SKIN_STATUS'] = "@ACTIVE";
-                $value['SKIN_NAME'] = '@'.$value['SKIN_NAME'];
-                $value['SKIN_DESCRIPTION'] = '@'.$value['SKIN_DESCRIPTION'];
-                $value['SKIN_AUTHOR'] = '@'.$value['SKIN_AUTHOR'];
-                $value['SKIN_CREATEDATE'] = '@'.$value['SKIN_CREATEDATE'];
-                $value['SKIN_MODIFIEDDATE'] = '@'.$value['SKIN_MODIFIEDDATE'];
+            if($skinList['currentSkin'] == $value['SKIN_FOLDER_ID']){ 
+                $wildcard = '@';
+                $value['SKIN_STATUS'] = $wildcard . G::LoadTranslation('ID_ACTIVE');
+                $value['SKIN_NAME'] = $wildcard . $value['SKIN_NAME'];
+                $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'] = "inactive";
+                $value['SKIN_STATUS'] = G::LoadTranslation('ID_INACTIVE');
             }
             $skinListArray['skins'][] = $value;
         }
diff --git a/workflow/engine/templates/setup/skinList.js b/workflow/engine/templates/setup/skinList.js
index 5f7553e79..326632c50 100755
--- a/workflow/engine/templates/setup/skinList.js
+++ b/workflow/engine/templates/setup/skinList.js
@@ -368,20 +368,30 @@ Ext.onReady(function(){
   });
 });
 
+gotWildCard = function (value){
+    var currentSkinWildcard = '@';
+    if(value.length <= 0){
+        return false;
+    }
+    return (value[0] == currentSkinWildcard);
+}
+
+setBoldItalic = function(value)
+{
+    return '<b><i>' + value + '</i></b>';
+}
 
 //Function format dates
 showdate = function (value){
-    if(value[0]=='@'){
-        str = _DF(value.substring(1));
-        return '<b><i>' + str + '</i></b>';
+    if(gotWildCard(value)){
+        return setBoldItalic(_DF(value.substring(1)));
     }
     return _DF(value);
 };
 
 selectedSkin = function (value){
-    if(value[0]=='@'){
-        str = value.substring(1);
-        return '<b><i>' + str + '</i></b>';
+    if(gotWildCard(value)){
+        return setBoldItalic(value.substring(1));
     }
     return value;
 };