--- a/phonebookui/Phonebook2/ccapplication/ccacommlauncherplugin/src/ccappcommlauncherheadercontrol.cpp	Fri Mar 12 15:41:25 2010 +0200
+++ b/phonebookui/Phonebook2/ccapplication/ccacommlauncherplugin/src/ccappcommlauncherheadercontrol.cpp	Mon Mar 15 12:39:26 2010 +0200
@@ -174,31 +174,13 @@
 //
 void CCCAppCommLauncherHeaderControl::SizeChanged()
     {    
-    const TInt isLandscape = Layout_Meta_Data::IsLandscapeOrientation() ? 1 : 0;
+    // No variation anymore in layout for portrait/landscape/statusbutton/
+    // no statusbutton (iStatusButtonVisibility) combinations (options 0,1,2). 
+    // Always use option 0.
+    //const TInt isLandscape = Layout_Meta_Data::IsLandscapeOrientation() ? 1 : 0;
     const TRect rect(Rect());
+    TInt option(0);    
     
-    /**
-     * Option0 (w button, lsc)
-     * Option2 (w/o button, lsc)
-     * Option0 (w button, prt)
-     * Option1 (w/o button, prt)
-     */
-   
-    // (w/o button)
-    TInt option( isLandscape ? 2 : 1 );
-    if( iStatusButtonVisibility )
-        {
-        // (w button)
-        if( isLandscape )
-            {
-            option = 0;
-            }
-        else
-            {
-            option = 0;
-            }
-        }    
-   
     FavoriteIconSizeChanged();
     
     AknLayoutUtils::LayoutImage(
@@ -709,24 +691,13 @@
      {
      //Set the size for the Favorite Icon
      //This code must be in Sync with SizeChanged() code
-     const TInt isLandscape = Layout_Meta_Data::IsLandscapeOrientation() ? 1 : 0;
+
+     // No variation anymore in layout for portrait/landscape/statusbutton/
+     // no statusbutton (iStatusButtonVisibility) combinations (options 0,1,2). 
+     // Always use option 0.
+     //const TInt isLandscape = Layout_Meta_Data::IsLandscapeOrientation() ? 1 : 0;
      const TRect rect(Rect());
-     
-     // (w/o button)
-     TInt option( isLandscape ? 2 : 1 );
-     if( iStatusButtonVisibility )
-         {
-         // (w button)
-         if( isLandscape )
-             {
-             option = 0;
-             }
-         else
-             {
-             option = 0;
-             }
-         }    
-    
+     TInt option( 0 );
      AknLayoutUtils::LayoutImage(
              iFavContactIcon, rect, AknLayoutScalable_Apps::phob2_cc_data_pane_g2(option));