--- a/camerauis/cameraapp/generic/data/vgacamsettings.rss	Wed Mar 31 21:06:44 2010 +0300
+++ b/camerauis/cameraapp/generic/data/vgacamsettings.rss	Wed Apr 14 15:41:04 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies). 
+* Copyright (c) 2008-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"
@@ -1081,8 +1081,8 @@
                     AVKON_BUTTON_STATE
                         {
                         bmpfile = CAMERAAPP_BITMAP_FILE;
-                        bmpid = EMbmCameraappQgn_indi_cam4_video;
-                        bmpmask = EMbmCameraappQgn_indi_cam4_video_mask;
+                        bmpid = EMbmCameraappQgn_indi_vid4_tb_video; 
+                        bmpmask = EMbmCameraappQgn_indi_vid4_tb_video_mask;
                         helptxt = qtn_lcam_tt_video_mode;
                         extension = r_cam_ext_qgn_indi_cam4_video;
                         }
@@ -1157,8 +1157,8 @@
                     AVKON_BUTTON_STATE
                         {
                         bmpfile = CAMERAAPP_BITMAP_FILE;
-                        bmpid = EMbmCameraappQgn_indi_cam4_video;
-                        bmpmask = EMbmCameraappQgn_indi_cam4_video_mask;
+                        bmpid = EMbmCameraappQgn_indi_vid4_tb_video; 
+                        bmpmask = EMbmCameraappQgn_indi_vid4_tb_video_mask;
                         helptxt = qtn_lcam_tt_video_mode;
                         extension = r_cam_ext_qgn_indi_cam4_video;
                         }
@@ -1231,9 +1231,9 @@
                     {
                     AVKON_BUTTON_STATE
                         {
-                        bmpfile = CAMERAAPP_BITMAP_FILE;
-                        bmpid = EMbmCameraappQgn_indi_cam4_camera; 
-                        bmpmask = EMbmCameraappQgn_indi_cam4_camera_mask; 
+                        bmpfile = CAMERAAPP_BITMAP_FILE; 
+                        bmpid = EMbmCameraappQgn_indi_vid4_tb_still; 
+                        bmpmask = EMbmCameraappQgn_indi_vid4_tb_still_mask; 
                         helptxt = qtn_lcam_tt_still_mode;
                         extension = r_cam_ext_qgn_indi_cam4_camera;
                         }
@@ -1309,8 +1309,8 @@
                     AVKON_BUTTON_STATE
                         {
                         bmpfile = CAMERAAPP_BITMAP_FILE;
-                        bmpid = EMbmCameraappQgn_indi_cam4_camera; 
-                        bmpmask = EMbmCameraappQgn_indi_cam4_camera_mask; 
+                        bmpid = EMbmCameraappQgn_indi_vid4_tb_still; 
+                        bmpmask = EMbmCameraappQgn_indi_vid4_tb_still_mask; 
                         helptxt = qtn_lcam_tt_still_mode;
                         extension = r_cam_ext_qgn_indi_cam4_camera;
                         }
@@ -1632,8 +1632,8 @@
                                 AVKON_BUTTON_STATE
                                     {
                                     bmpfile = CAMERAAPP_BITMAP_FILE;
-                                    bmpid = EMbmCameraappQgn_indi_cam4_video;
-                                    bmpmask = EMbmCameraappQgn_indi_cam4_video_mask;
+                                    bmpid = EMbmCameraappQgn_indi_vid4_tb_video; 
+                                    bmpmask = EMbmCameraappQgn_indi_vid4_tb_video_mask;
                                     txt = qtn_lcam_tb_switch_video_mode;
                                     extension = r_cam_ext_qgn_indi_cam4_video;
                                     }
@@ -2378,8 +2378,8 @@
                                  AVKON_BUTTON_STATE
                                      {
                                      bmpfile = CAMERAAPP_BITMAP_FILE;
-                                     bmpid = EMbmCameraappQgn_indi_cam4_camera;
-                                     bmpmask = EMbmCameraappQgn_indi_cam4_camera_mask;
+                                     bmpid = EMbmCameraappQgn_indi_vid4_tb_still; 
+                                     bmpmask = EMbmCameraappQgn_indi_vid4_tb_still_mask; 
                                      txt = qtn_lcam_tb_switch_mode;
                                      extension = r_cam_ext_qgn_indi_cam4_camera;
                                      }
@@ -2536,8 +2536,8 @@
                                 AVKON_BUTTON_STATE
                                     {
                                     bmpfile = CAMERAAPP_BITMAP_FILE;
-                                    bmpid = EMbmCameraappQgn_indi_cam4_camera;
-                                    bmpmask = EMbmCameraappQgn_indi_cam4_camera_mask;
+                                    bmpid = EMbmCameraappQgn_indi_vid4_tb_still; 
+                                    bmpmask = EMbmCameraappQgn_indi_vid4_tb_still_mask; 
                                     txt = qtn_lcam_tb_switch_mode;
                                     extension = r_cam_ext_qgn_indi_cam4_camera;
                                     }