diff --git a/workflow/engine/templates/authSources/authSourcesList.js b/workflow/engine/templates/authSources/authSourcesList.js
index b9b5ae1a8..1a3116a9f 100755
--- a/workflow/engine/templates/authSources/authSourcesList.js
+++ b/workflow/engine/templates/authSources/authSourcesList.js
@@ -123,7 +123,7 @@ Ext.onReady(function(){
 
     clearTextButton = new Ext.Action({
       text: 'X',
-      ctCls:'pm_search_x_button',
+      ctCls:"pm_search_x_button_des",
       handler: GridByDefault
     });
 
diff --git a/workflow/engine/templates/cases/casesList.js b/workflow/engine/templates/cases/casesList.js
index f974454ff..3038dd6d2 100644
--- a/workflow/engine/templates/cases/casesList.js
+++ b/workflow/engine/templates/cases/casesList.js
@@ -158,25 +158,25 @@ function deleteCase() {
                 icon: Ext.MessageBox.ERROR,
                 buttons: Ext.MessageBox.OK,
                 fn : function(btn) {
-                   try 
+                   try
                      {
                        prnt = parent.parent;
                        top.location = top.location;
                      }
-                   catch (err) 
+                   catch (err)
                       {
                        parent.location = parent.location;
                       }
-                } 
+                }
               });
         } else {
 		  if( rows.length > 0 ) {
 		    ids = Array();
 		    for(i=0; i<rows.length; i++)
 		      ids[i] = rows[i].get('APP_UID');
-		
+
 		    APP_UIDS = ids.join(',');
-		
+
 		    Ext.Msg.confirm(
 		      _('ID_CONFIRM'),
 		      (rows.length == 1) ? _('ID_MSG_CONFIRM_DELETE_CASE') : _('ID_MSG_CONFIRM_DELETE_CASES'),
@@ -1199,7 +1199,7 @@ Ext.onReady ( function() {
 
   var resetSearchButton = {
     text:'X',
-	  ctCls:'pm_search_x_button',
+	   ctCls:"pm_search_x_button_des",
     handler: function(){
       textSearch.setValue('');
       doSearch();
@@ -1329,12 +1329,12 @@ Ext.onReady ( function() {
                         icon: Ext.MessageBox.ERROR,
                         buttons: Ext.MessageBox.OK,
                         fn : function(btn) {
-                          try 
+                          try
                             {
                              prnt = parent.parent;
                              top.location = top.location;
                             }
-                          catch (err) 
+                          catch (err)
                               {
                                parent.location = parent.location;
                               }
@@ -1349,7 +1349,7 @@ Ext.onReady ( function() {
                   Ext.MessageBox.alert( _('ID_FAILED'), result.responseText);
                 }
               }
-         }); 
+         });
       }
     })
   });
@@ -1410,7 +1410,7 @@ Ext.onReady ( function() {
   }
 
   //optionMenuPause.setMinValue('2010-11-04');
-  
+
   var optionMenuReassignGlobal = {};
   optionMenuReassignGlobal.APP_UID = "";
   optionMenuReassignGlobal.DEL_INDEX = "";
@@ -1432,12 +1432,12 @@ Ext.onReady ( function() {
                       icon: Ext.MessageBox.ERROR,
                       buttons: Ext.MessageBox.OK,
                       fn : function(btn) {
-                        try 
+                        try
                           {
                            prnt = parent.parent;
                            top.location = top.location;
                           }
-                        catch (err) 
+                        catch (err)
                           {
                            parent.location = parent.location;
                           }
@@ -2242,12 +2242,12 @@ function reassign(){
                 icon: Ext.MessageBox.ERROR,
                 buttons: Ext.MessageBox.OK,
                 fn : function(btn) {
-                  try 
+                  try
                      {
                        prnt = parent.parent;
                        top.location = top.location;
                      }
-                   catch (err) 
+                   catch (err)
                       {
                        parent.location = parent.location;
                       }
@@ -2258,17 +2258,17 @@ function reassign(){
 		    ids = '';
 		    for(i=0; i<rows.length; i++) {
 		      // filtering duplicate tasks
-		
+
 		         if( i != 0 ) ids += ',';
 		         ids += rows[i].get('APP_UID') + "|" + rows[i].get('TAS_UID')+ "|" + rows[i].get('DEL_INDEX');
 		    }
 		    storeReassignCases.setBaseParam( 'APP_UIDS', ids);
 			//storeReassignCases.setBaseParam( 'action', 'to_reassign');
 		    storeReassignCases.load();
-		
+
 		    newPopUp.show();
 		    comboUsersToReassign.disable();
-		
+
 		    //grid = reassignGrid.store.data;
 		    //Ext.Msg.alert ( grid );
 		/*
diff --git a/workflow/engine/templates/cases/casesSchedulerLog.js b/workflow/engine/templates/cases/casesSchedulerLog.js
index 500c04290..f227d49f1 100755
--- a/workflow/engine/templates/cases/casesSchedulerLog.js
+++ b/workflow/engine/templates/cases/casesSchedulerLog.js
@@ -77,7 +77,7 @@ Ext.onReady(function(){
 
   clearTextButton = new Ext.Action({
     text: 'X',
-    ctCls:'pm_search_x_button',
+    ctCls:"pm_search_x_button_des",
     handler: GridByDefault
   });
 
@@ -218,7 +218,7 @@ Ext.onReady(function(){
     })
   });
 
-  infoGrid.on('rowcontextmenu', 
+  infoGrid.on('rowcontextmenu',
       function (grid, rowIndex, evt) {
     var sm = grid.getSelectionModel();
     sm.selectRow(rowIndex, sm.isSelected(rowIndex));
@@ -226,10 +226,10 @@ Ext.onReady(function(){
   this
   );
 
-  infoGrid.on('contextmenu', 
+  infoGrid.on('contextmenu',
       function (evt) {
     evt.preventDefault();
-  }, 
+  },
   this
   );
 
@@ -270,7 +270,7 @@ ShowSelectedLog = function(){
     Ext.getCmp('cstatus').setText(rowSelected.data.WS_CREATE_CASE_STATUS);
     Ext.getCmp('rstatus').setText(rowSelected.data.WS_ROUTE_CASE_STATUS);
     w = new Ext.Window({
-      autoHeight: true, 
+      autoHeight: true,
       width: 550,
       resizable: false,
       closable: false,
@@ -305,5 +305,3 @@ UpdatePageConfig = function(pageSize){
     params: {action:'updatePageSize', size: pageSize}
   });
 };
-
-
diff --git a/workflow/engine/templates/groups/groupsList.js b/workflow/engine/templates/groups/groupsList.js
index 2e5b6512c..4b4ec287d 100755
--- a/workflow/engine/templates/groups/groupsList.js
+++ b/workflow/engine/templates/groups/groupsList.js
@@ -123,11 +123,10 @@ Ext.onReady(function(){
 
   clearTextButton = new Ext.Action({
     text: 'X',
-    ctCls:'pm_search_x_button',
+    ctCls:"pm_search_x_button_des",
     handler: GridByDefault
   });
 
-
   smodel = new Ext.grid.RowSelectionModel({
     singleSelect: true,
     listeners:{
diff --git a/workflow/engine/templates/processCategory/processCategoryList.js b/workflow/engine/templates/processCategory/processCategoryList.js
index e89a19125..95c020e32 100755
--- a/workflow/engine/templates/processCategory/processCategoryList.js
+++ b/workflow/engine/templates/processCategory/processCategoryList.js
@@ -76,7 +76,7 @@ Ext.onReady(function(){
     text: _('ID_EDIT'),
     iconCls: 'button_menu_ext ss_sprite  ss_pencil',
     handler: EditCategory,
-    disabled: true	
+    disabled: true
   });
 
   deleteButton = new Ext.Action({
@@ -116,13 +116,13 @@ Ext.onReady(function(){
 
   clearTextButton = new Ext.Action({
     text: 'X',
-    ctCls:'pm_search_x_button',
+    ctCls:"pm_search_x_button_des",
     handler: GridByDefault
   });
 
   newForm = new Ext.FormPanel({
     url: 'processCategory_Ajax?action=saveNewCategory',
-    frame: true, 	
+    frame: true,
     items:[
            {xtype: 'textfield', fieldLabel: _('ID_CATEGORY_NAME'), name: 'category', width: 250, allowBlank: false}
            ],
@@ -185,7 +185,7 @@ Ext.onReady(function(){
     columns: [
               {id:'CATEGORY_UID', dataIndex: 'CATEGORY_UID', hidden:true, hideable:false},
               {header: _('ID_CATEGORY_NAME'), dataIndex: 'CATEGORY_NAME', width: 500, hidden:false, align:'left'},
-              {header: _('ID_PROCESSES'), dataIndex: 'TOTAL_PROCESSES', width: 100, hidden: false, align: 'center'}  
+              {header: _('ID_PROCESSES'), dataIndex: 'TOTAL_PROCESSES', width: 100, hidden: false, align: 'center'}
               ]
   });
 
@@ -258,7 +258,7 @@ Ext.onReady(function(){
     })
   });
 
-  infoGrid.on('rowcontextmenu', 
+  infoGrid.on('rowcontextmenu',
       function (grid, rowIndex, evt) {
     var sm = grid.getSelectionModel();
     sm.selectRow(rowIndex, sm.isSelected(rowIndex));
@@ -266,10 +266,10 @@ Ext.onReady(function(){
   this
   );
 
-  infoGrid.on('contextmenu', 
+  infoGrid.on('contextmenu',
       function (evt) {
     evt.preventDefault();
-  }, 
+  },
   this
   );
 
@@ -459,7 +459,7 @@ DeleteCategory = function(){
                   deleteButton.disable(); //Disable Delete Button
                   resp = Ext.decode(r.responseText);
                   if (resp.success){
-                    PMExt.notify(_('ID_PROCESS_CATEGORY'),_('ID_CATEGORY_SUCCESS_DELETE'));	
+                    PMExt.notify(_('ID_PROCESS_CATEGORY'),_('ID_CATEGORY_SUCCESS_DELETE'));
                   }else{
                     PMExt.error(_('ID_ERROR'),_('ID_MSG_AJAX_FAILURE'));
                   }
@@ -487,7 +487,7 @@ GridByDefault = function(){
 
 //Do Search Function
 DoSearch = function(){
-  infoGrid.store.load({params: {textFilter: searchText.getValue()}});	
+  infoGrid.store.load({params: {textFilter: searchText.getValue()}});
 };
 
 //Update Page Size Configuration
diff --git a/workflow/engine/templates/roles/rolesList.js b/workflow/engine/templates/roles/rolesList.js
index b70a09b51..067dc6275 100755
--- a/workflow/engine/templates/roles/rolesList.js
+++ b/workflow/engine/templates/roles/rolesList.js
@@ -4,7 +4,7 @@
  */
 
 //Keyboard Events
-new Ext.KeyMap(document, 
+new Ext.KeyMap(document,
     [
      {
        key: Ext.EventObject.F5,
@@ -77,7 +77,7 @@ Ext.onReady(function(){
     text: _('ID_EDIT'),
     iconCls: 'button_menu_ext ss_sprite  ss_pencil',
     handler: EditRole,
-    disabled: true	
+    disabled: true
   });
 
   deleteButton = new Ext.Action({
@@ -130,7 +130,7 @@ Ext.onReady(function(){
 
   clearTextButton = new Ext.Action({
     text: 'X',
-    ctCls:'pm_search_x_button',
+    ctCls:"pm_search_x_button_des",
     handler: GridByDefault
   });
 
@@ -141,7 +141,7 @@ Ext.onReady(function(){
 
   newForm = new Ext.FormPanel({
     url: 'roles_Ajax?request=saveNewRole',
-    frame: true, 	
+    frame: true,
     items:[
            {xtype: 'textfield', fieldLabel: _('ID_CODE'), name: 'code', width: 250, allowBlank: false,
             listeners: {
@@ -172,17 +172,17 @@ Ext.onReady(function(){
                   });
                 }
              }
-            }}, 
+            }},
            {
-             xtype: 'combo', 
-             fieldLabel: _('ID_STATUS'), 
+             xtype: 'combo',
+             fieldLabel: _('ID_STATUS'),
              hiddenName: 'status',
              typeAhead: true,
-             mode: 'local', 
-             store: comboStatusStore, 
-             displayField: 'value', 
+             mode: 'local',
+             store: comboStatusStore,
+             displayField: 'value',
              valueField:'id',
-             allowBlank: false, 
+             allowBlank: false,
              editable:false,
              triggerAction: 'all',
              emptyText: _('ID_SELECT_STATUS'),
@@ -202,7 +202,7 @@ Ext.onReady(function(){
     items:[
            {xtype: 'textfield', name: 'rol_uid', hidden: true },
            {xtype: 'textfield', fieldLabel: _('ID_CODE'), name: 'code', width: 250, allowBlank: false, readOnly: true, hidden: !PARTNER_FLAG ? false : true},
-           {xtype: 'textfield', fieldLabel: _('ID_NAME'), name: 'name', width: 200, allowBlank: false, 
+           {xtype: 'textfield', fieldLabel: _('ID_NAME'), name: 'name', width: 200, allowBlank: false,
             listeners: {
               blur : function(ob)
              {
@@ -218,15 +218,15 @@ Ext.onReady(function(){
              }
             }},
            {
-             xtype: 'combo', 
-             fieldLabel: _('ID_STATUS'), 
+             xtype: 'combo',
+             fieldLabel: _('ID_STATUS'),
              hiddenName: 'status',
              typeAhead: true,
-             mode: 'local', 
-             store: comboStatusStore, 
-             displayField: 'value', 
+             mode: 'local',
+             store: comboStatusStore,
+             displayField: 'value',
              valueField:'id',
-             allowBlank: false, 
+             allowBlank: false,
              editable:false,
              triggerAction: 'all',
              emptyText: _('ID_SELECT_STATUS'),
@@ -358,7 +358,7 @@ Ext.onReady(function(){
     })
   });
 
-  infoGrid.on('rowcontextmenu', 
+  infoGrid.on('rowcontextmenu',
       function (grid, rowIndex, evt) {
     var sm = grid.getSelectionModel();
     sm.selectRow(rowIndex, sm.isSelected(rowIndex));
@@ -366,10 +366,10 @@ Ext.onReady(function(){
   this
   );
 
-  infoGrid.on('contextmenu', 
+  infoGrid.on('contextmenu',
       function (evt) {
     evt.preventDefault();
-  }, 
+  },
   this
   );
 
@@ -457,9 +457,9 @@ SaveNewRole = function(){
                 break;
             }
           }
-        });  
+        });
       }else{
-        PMExt.error(_('ID_ROLES'),_('ID_ROLE_EXISTS'));        
+        PMExt.error(_('ID_ROLES'),_('ID_ROLE_EXISTS'));
       }
     },
     failure: function(r,o){
@@ -630,7 +630,7 @@ GridByDefault = function(){
 
 //Do Search Function
 DoSearch = function(){
-  infoGrid.store.load({params: {textFilter: searchText.getValue()}});	
+  infoGrid.store.load({params: {textFilter: searchText.getValue()}});
 };
 
 //Render Date Function
diff --git a/workflow/engine/templates/setup/calendarList.js b/workflow/engine/templates/setup/calendarList.js
index 363c0e7e3..032cb8cf6 100755
--- a/workflow/engine/templates/setup/calendarList.js
+++ b/workflow/engine/templates/setup/calendarList.js
@@ -64,45 +64,45 @@ var cal_default = '00000000000000000000000000000001';
 
 Ext.onReady(function(){
     Ext.QuickTips.init();
-    
+
     pageSize = parseInt(CONFIG.pageSize);
-    
+
     newButton = new Ext.Action({
     	text: _('ID_NEW'),
     	iconCls: 'button_menu_ext ss_sprite  ss_add',
     	handler: NewCalendarAction
     });
-    
+
     editButton = new Ext.Action({
     	text: _('ID_EDIT'),
     	iconCls: 'button_menu_ext ss_sprite  ss_pencil',
     	handler: EditCalendarAction,
-    	disabled: true	
+    	disabled: true
     });
-    
+
     deleteButton = new Ext.Action({
     	text: _('ID_DELETE'),
     	iconCls: 'button_menu_ext ss_sprite  ss_delete',
     	handler: DeleteButtonAction,
     	disabled: true
     });
-    
+
     copyButton = new Ext.Action({
     	text: _('ID_COPY'),
     	iconCls: 'button_menu_ext ss_sprite ss_calendar_add',
     	handler: CopyButtonAction,
     	disabled: true
     });
-    
+
     searchButton = new Ext.Action({
     	text: _('ID_SEARCH'),
     	handler: DoSearch
     });
-    
+
     contextMenu = new Ext.menu.Menu({
     	items: [editButton, deleteButton,'-',copyButton]
     });
-    
+
     searchText = new Ext.form.TextField ({
         id: 'searchTxt',
         ctCls:'pm_search_text_field',
@@ -121,14 +121,14 @@ Ext.onReady(function(){
           		 }
         }
     });
-    
+
     clearTextButton = new Ext.Action({
     	text: 'X',
-    	ctCls:'pm_search_x_button',
+    	ctCls:"pm_search_x_button_des",
     	handler: GridByDefault
     });
-    
-   
+
+
     smodel = new Ext.grid.RowSelectionModel({
     	singleSelect: true,
     	listeners:{
@@ -145,7 +145,7 @@ Ext.onReady(function(){
     		}
     	}
     });
-    
+
     store = new Ext.data.GroupingStore( {
         proxy : new Ext.data.HttpProxy({
             url: 'calendar_Ajax?action=calendarList'
@@ -164,7 +164,7 @@ Ext.onReady(function(){
     		    ]
     	})
     });
-    
+
     cmodel = new Ext.grid.ColumnModel({
         defaults: {
             width: 50,
@@ -180,13 +180,13 @@ Ext.onReady(function(){
             {header: _('ID_TASKS'), dataIndex: 'TOTAL_TASKS', width: 69, align:'center'}
             ]
     });
-    
+
     storePageSize = new Ext.data.SimpleStore({
         fields: ['size'],
          data: [['20'],['30'],['40'],['50'],['100']],
          autoLoad: true
       });
-        
+
     comboPageSize = new Ext.form.ComboBox({
       typeAhead     : false,
       mode          : 'local',
@@ -204,9 +204,9 @@ Ext.onReady(function(){
           }
         }
       });
-        
+
       comboPageSize.setValue(pageSize);
-      
+
       bbarpaging = new Ext.PagingToolbar({
         pageSize: pageSize,
         store: store,
@@ -215,8 +215,8 @@ Ext.onReady(function(){
         emptyMsg: _('ID_GRID_PAGE_NO_CALENDAR_MESSAGE'),
         items: ['-',_('ID_PAGE_SIZE')+':',comboPageSize]
       });
-    
-    
+
+
     infoGrid = new Ext.grid.GridPanel({
     	region: 'center',
     	layout: 'fit',
@@ -247,15 +247,15 @@ Ext.onReady(function(){
     		groupTextTpl: '{text}'
     	})
     });
-    
-    infoGrid.on('rowcontextmenu', 
+
+    infoGrid.on('rowcontextmenu',
     		function (grid, rowIndex, evt) {
         		var sm = grid.getSelectionModel();
         		sm.selectRow(rowIndex, sm.isSelected(rowIndex));
     		},
     		this
     );
-    
+
     infoGrid.on('contextmenu', function(evt){evt.preventDefault();}, this);
     infoGrid.addListener('rowcontextmenu',onMessageContextMenu, this);
     infoGrid.store.load();
@@ -293,7 +293,7 @@ GridByDefault = function(){
 
 //Do Search Function
 DoSearch = function(){
-   infoGrid.store.load({params: {textFilter: searchText.getValue()}});	
+   infoGrid.store.load({params: {textFilter: searchText.getValue()}});
 };
 
 //Edit Calendar Action
@@ -333,13 +333,13 @@ DeleteButtonAction = function(){
     	    		failure: function(r,o){
     	    		  viewport.getEl().unmask();
     	    		}
-    	    	});	
+    	    	});
     		}
-    	  }		
+    	  }
     	);
       }else{
-    	 PMExt.error(_('ID_CALENDARS'),_('ID_MSG_CANNOT_DELETE_CALENDAR')); 
-      }	
+    	 PMExt.error(_('ID_CALENDARS'),_('ID_MSG_CANNOT_DELETE_CALENDAR'));
+      }
     },
     failure: function(r,o){
       viewport.getEl().unmask();
@@ -359,7 +359,7 @@ render_status = function(v){
 //Members Button Action
 CopyButtonAction = function(){
   rowSelected = infoGrid.getSelectionModel().getSelected();
-  if (rowSelected){    
+  if (rowSelected){
     location.href = '../admin/calendarEdit?cp=1&id=' + rowSelected.data.CALENDAR_UID;
   }
 };
diff --git a/workflow/engine/templates/setup/skinList.js b/workflow/engine/templates/setup/skinList.js
index 8ac02397f..5f9062b6e 100755
--- a/workflow/engine/templates/setup/skinList.js
+++ b/workflow/engine/templates/setup/skinList.js
@@ -120,20 +120,19 @@ Ext.onReady(function(){
 
   clearTextButton = new Ext.Action({
     text: 'X',
-    ctCls:'pm_search_x_button',
+    ctCls:"pm_search_x_button_des",
     handler: GridByDefault
   });
 
-
   smodel = new Ext.grid.RowSelectionModel({
     singleSelect: true,
     listeners:{
       rowselect: function(sm){
         rowSelected = infoGrid.getSelectionModel().getSelected();
-        
+
         if((rowSelected.data.SKIN_FOLDER_ID)&&(rowSelected.data.SKIN_FOLDER_ID!="classic")&&(rowSelected.data.SKIN_FOLDER_ID!="neoclassic")){
           exportButton.enable();
-          
+
           if (rowSelected.data.SKIN_STATUS!='Inactive') {
             deleteButton.disable();
           } else {
@@ -662,7 +661,7 @@ importSkin = function(){
 
               if( !action.result ) {
                 Ext.MessageBox.alert( _('ID_ERROR') , _('ID_ERROR'));
-                return; 
+                return;
               }
               Ext.MessageBox.alert( _('ID_ERROR') , action.result.error);
 
diff --git a/workflow/engine/templates/users/usersList.js b/workflow/engine/templates/users/usersList.js
index 763c59e1e..42c65ec9f 100755
--- a/workflow/engine/templates/users/usersList.js
+++ b/workflow/engine/templates/users/usersList.js
@@ -155,8 +155,8 @@ Ext.onReady(function(){
   });
 
   clearTextButton = new Ext.Action({
-    text: 'X',
-     ctCls:'pm_search_x_button',
+     text: 'X',
+     ctCls:"pm_search_x_button_des",
      handler: GridByDefault
   });