--- a/camerauis/cameraapp/generic/data/nhdcamsettings.rss	Mon Jan 18 20:06:55 2010 +0200
+++ b/camerauis/cameraapp/generic/data/nhdcamsettings.rss	Tue Jan 26 11:44:00 2010 +0200
@@ -2167,26 +2167,6 @@
                     TBAR_CTRL
                         {
                         type = EAknCtButton;
-                        id = ECamCmdNewPhoto;
-                        control = AVKON_BUTTON
-                            {
-                            flags = KAknButtonNoFrame;
-                            states =
-                                {
-                                AVKON_BUTTON_STATE
-                                    {
-                                    bmpfile = CAMERAAPP_BITMAP_FILE;
-                                    bmpid = EMbmCameraappQgn_indi_cam4_camera;
-                                    bmpmask = EMbmCameraappQgn_indi_cam4_camera_mask;
-                                    txt = qtn_lcam_tb_switch_mode;
-                                    extension = r_cam_ext_qgn_indi_cam4_camera;
-                                    }
-                                };
-                            };
-                        },
-                    TBAR_CTRL
-                        {
-                        type = EAknCtButton;
                         id = ECamCmdCaptureSetupWhiteBalanceVideo;
                         control = AVKON_BUTTON
                             {
@@ -2235,6 +2215,26 @@
                                     }
                                 };
                             };
+                        },
+                    TBAR_CTRL
+                        {
+                        type = EAknCtButton;
+                        id = ECamCmdNewPhoto;
+                        control = AVKON_BUTTON
+                            {
+                            flags = KAknButtonNoFrame;
+                            states =
+                                {
+                                AVKON_BUTTON_STATE
+                                    {
+                                    bmpfile = CAMERAAPP_BITMAP_FILE;
+                                    bmpid = EMbmCameraappQgn_indi_cam4_camera;
+                                    bmpmask = EMbmCameraappQgn_indi_cam4_camera_mask;
+                                    txt = qtn_lcam_tb_switch_mode;
+                                    extension = r_cam_ext_qgn_indi_cam4_camera;
+                                    }
+                                };
+                            };
                         }                        
                     };
                 };
@@ -2325,26 +2325,6 @@
                     TBAR_CTRL
                         {
                         type = EAknCtButton;
-                        id = ECamCmdNewPhoto;
-                        control = AVKON_BUTTON
-                            {
-                            flags = KAknButtonNoFrame;
-                            states =
-                                {
-                                AVKON_BUTTON_STATE
-                                    {
-                                    bmpfile = CAMERAAPP_BITMAP_FILE;
-                                    bmpid = EMbmCameraappQgn_indi_cam4_camera;
-                                    bmpmask = EMbmCameraappQgn_indi_cam4_camera_mask;
-                                    txt = qtn_lcam_tb_switch_mode;
-                                    extension = r_cam_ext_qgn_indi_cam4_camera;
-                                    }
-                                };
-                            };
-                        },
-                    TBAR_CTRL
-                        {
-                        type = EAknCtButton;
                         id = ECamCmdCaptureSetupWhiteBalanceVideo;
                         control = AVKON_BUTTON
                             {
@@ -2393,6 +2373,26 @@
                                     }
                                 };
                             };
+                        },
+                    TBAR_CTRL
+                        {
+                        type = EAknCtButton;
+                        id = ECamCmdNewPhoto;
+                        control = AVKON_BUTTON
+                            {
+                            flags = KAknButtonNoFrame;
+                            states =
+                                {
+                                AVKON_BUTTON_STATE
+                                    {
+                                    bmpfile = CAMERAAPP_BITMAP_FILE;
+                                    bmpid = EMbmCameraappQgn_indi_cam4_camera;
+                                    bmpmask = EMbmCameraappQgn_indi_cam4_camera_mask;
+                                    txt = qtn_lcam_tb_switch_mode;
+                                    extension = r_cam_ext_qgn_indi_cam4_camera;
+                                    }
+                                };
+                            };
                         }                        
                     };
                 };