diff -r f0c0788c4de2 -r 756ad29ed18e camerauis/cameraapp/generic/src/CamLocationIconController.cpp
--- a/camerauis/cameraapp/generic/src/CamLocationIconController.cpp	Wed Sep 15 11:51:19 2010 +0300
+++ b/camerauis/cameraapp/generic/src/CamLocationIconController.cpp	Wed Oct 13 14:09:54 2010 +0300
@@ -13,6 +13,17 @@
 *
 * Description:  Implemantation for CCamLocationIconController class.
 *
+*  Copyright © 2007 Nokia.  All rights reserved.
+*  This material, including documentation and any related computer
+*  programs, is protected by copyright controlled by Nokia.  All
+*  rights are reserved.  Copying, including reproducing, storing,
+*  adapting or translating, any or all of this material requires the
+*  prior written consent of Nokia.  This material also contains
+*  confidential information which may not be disclosed to others
+*  without the prior written consent of Nokia.
+
+*
+*
 */
 
 
@@ -248,7 +259,7 @@
 			 ( ECamPaused == operation )   ||
 			 ( ECamResuming == operation ))
 			{
-	        if ( AknLayoutUtils::PenEnabled() ) 
+	        if ( CamUtility::IsNhdDevice() ) 
 	            {
                 if ( Layout_Meta_Data::IsLandscapeOrientation() )
                     {
@@ -293,7 +304,7 @@
 			}
 		else
 			{
-            if ( AknLayoutUtils::PenEnabled() ) 
+            if ( CamUtility::IsNhdDevice() ) 
                 {
                 if ( Layout_Meta_Data::IsLandscapeOrientation() )
                     {
@@ -337,7 +348,7 @@
 		}
 	else
 		{
-        if ( AknLayoutUtils::PenEnabled() ) 
+        if ( CamUtility::IsNhdDevice() ) 
             {
     	    if ( Layout_Meta_Data::IsLandscapeOrientation() )
     	        {