--- a/camerauis/cameraapp/generic/src/CamUserSceneSetupViewBase.cpp	Mon Mar 15 12:39:00 2010 +0200
+++ b/camerauis/cameraapp/generic/src/CamUserSceneSetupViewBase.cpp	Wed Mar 31 21:06:44 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2007 Nokia Corporation and/or its subsidiary(-ies). 
+* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies). 
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -131,7 +131,7 @@
             break;
      	case ECamCmdCaptureSetupLightSensitivityUser:
       		{
-       		SwitchToInfoListBoxL( EInfoListBoxModeISO, ETrue );
+      		SwitchToInfoListBoxL( EInfoListBoxModeISO, EFalse );//No skin
       		}    
 			break;
         // If capture setup menu is active and user presses softkey cancel,
@@ -448,7 +448,7 @@
             }
         else
             {
-            SetSoftKeysL( R_CAM_SOFTKEYS_SELECT_CANCEL );
+            SetSoftKeysL( R_CAM_SOFTKEYS_SETTINGS_SELECT_BACK__CHANGE_TRANSPARENT );//color etc.
             }
         }
     else if ( iSceneSettingModeActive )
@@ -462,12 +462,9 @@
     	}
     else if ( iInfoListBoxActive )
         {
-        SetSoftKeysL( R_CAM_SOFTKEYS_SETTINGS_SELECT_BACK__CHANGE );
-        if( iForceAvkonCBA )
-            {
-            EikSoftkeyPostingTransparency::MakeTransparent(
-                    *ViewCba(), EFalse );            
-            }
+        SetSoftKeysL( R_CAM_SOFTKEYS_SETTINGS_SELECT_BACK__CHANGE_TRANSPARENT );
+        EikSoftkeyPostingTransparency::MakeTransparent(   
+                            *ViewCba(), !iForceAvkonCBA );
         }
     // if the view is user scene setup
     else
@@ -517,7 +514,7 @@
     StatusPane()->MakeVisible( ETrue );
     
     // Update the command button array.
-    iForceAvkonCBA=ETrue;
+    iForceAvkonCBA=EFalse;
     UpdateCbaL();
     SetTitlePaneTextL();
     PRINT( _L("Camera <= CCamUserSceneSetupViewBase::SwitchToUserSceneSetupModeL()") );  	   
@@ -544,7 +541,7 @@
 
     // Remove the view's main container, and add the capture setup 
     // control associated with the input command to the container stack.
-    CCamCaptureSetupViewBase::SwitchToCaptureSetupModeL( aSetupCommand, EFalse );
+    CCamCaptureSetupViewBase::SwitchToCaptureSetupModeL( aSetupCommand, ETrue );
    StatusPane()->MakeVisible( EFalse ); 	
     PRINT( _L("Camera <= CCamUserSceneSetupViewBase::SwitchToCaptureSetupModeL()") );  	   	
     }