diff --git a/workflow/engine/templates/admin/pmLogo.html b/workflow/engine/templates/admin/pmLogo.html
index 97c29e19e..94f930244 100644
--- a/workflow/engine/templates/admin/pmLogo.html
+++ b/workflow/engine/templates/admin/pmLogo.html
@@ -90,7 +90,7 @@
 
   #images-view .x-view-selected {
     border     : 1px solid #99bbe8;
-    background : #eff5fb url(/images/selected.gif) no-repeat right bottom;
+    background : #eff5fb url(/images/select-icon.png) no-repeat right bottom;
     opacity    : 0.5;
     padding    : 5px;
   }
diff --git a/workflow/engine/templates/setup/skinList.js b/workflow/engine/templates/setup/skinList.js
index 97f35ab60..79e168ff4 100755
--- a/workflow/engine/templates/setup/skinList.js
+++ b/workflow/engine/templates/setup/skinList.js
@@ -801,7 +801,7 @@ function changeSkin(newSkin,currentSkin){
       success: function(r, o){
         var response = Ext.util.JSON.decode(r.responseText);
         if (response.success) {
-          currentLocation = top.location.href;
+          currentLocation = parent.parent.location.href;
           createCookie ('workspaceSkin', newSkin, '1');
           if (currentSkin.substring(0,2) != 'ux') {
             if (newSkin.substring(0,2) == 'ux') {
@@ -820,9 +820,8 @@ function changeSkin(newSkin,currentSkin){
           if (point == -1) {
             newLocation = newLocation +"?s=SKINS";
           }
-          top.location.href = newLocation;
-        }
-        else {
+          parent.parent.location = newLocation;
+        } else {
           viewport.getEl().unmask();
           PMExt.error(_('ID_SKINS'), response.message);
         }