--- a/camerauis/cameraxui/cxui/src/cxuistillprecaptureview.cpp	Wed Aug 18 09:37:18 2010 +0300
+++ b/camerauis/cameraxui/cxui/src/cxuistillprecaptureview.cpp	Thu Sep 02 20:14:28 2010 +0300
@@ -381,9 +381,15 @@
     CX_DEBUG_ENTER_FUNCTION();
     QVariantMap data;
     QVariantHash params;
-    //@todo: add pre-capture icon as screenshot
-    mActivityManager->removeActivity(CxuiActivityIds::STILL_PRECAPTURE_ACTIVITY);
-    mActivityManager->addActivity(CxuiActivityIds::STILL_PRECAPTURE_ACTIVITY, data, params);
+
+    HbIcon activityScreenshot("qtg_graf_taskswitcher_camera");
+    QPixmap screenshot = activityScreenshot.pixmap();
+    params.insert("screenshot", screenshot);
+
+    mActivityManager->removeActivity(
+            CxuiActivityIds::STILL_PRECAPTURE_ACTIVITY);
+    mActivityManager->addActivity(CxuiActivityIds::STILL_PRECAPTURE_ACTIVITY,
+                                  data, params);
     CX_DEBUG_EXIT_FUNCTION();
 }
 
@@ -882,6 +888,11 @@
             handleSettingValueChanged(CxeSettingIds::FLASH_MODE, QVariant(flashMode));
         }
 
+        // If facetracking is changed, we need to update the indicator icon
+        if (scene.contains(CxeSettingIds::FACE_TRACKING)) {
+            handleSettingValueChanged(CxeSettingIds::FACE_TRACKING, scene[CxeSettingIds::FACE_TRACKING]);
+        }
+
     }
 
     CX_DEBUG_EXIT_FUNCTION();