diff --git a/src/qml/QFieldLocalDataPickerScreen.qml b/src/qml/QFieldLocalDataPickerScreen.qml
index f95852f29f..369423ed56 100644
--- a/src/qml/QFieldLocalDataPickerScreen.qml
+++ b/src/qml/QFieldLocalDataPickerScreen.qml
@@ -260,7 +260,7 @@ Page {
           property Item pressedItem
           anchors.fill: parent
           anchors.rightMargin: 48
-          onClicked: {
+          onClicked: (mouse) => {
             if (itemMenu.visible) {
               itemMenu.close();
             } else if (importMenu.visible) {
@@ -283,7 +283,7 @@ Page {
               }
             }
           }
-          onPressed: {
+          onPressed: (mouse) => {
             if (itemMenu.visible || importMenu.visible)
               return;
 
@@ -309,7 +309,7 @@ Page {
             }
           }
 
-          onPressAndHold: {
+          onPressAndHold: (mouse) => {
             var item = table.itemAt(
                   table.contentX + mouse.x,
                   table.contentY + mouse.y
diff --git a/src/qml/imports/QFieldControls/+Qt6/CodeReader.qml b/src/qml/imports/QFieldControls/+Qt6/CodeReader.qml
index 9d59b89fc6..789a52851f 100644
--- a/src/qml/imports/QFieldControls/+Qt6/CodeReader.qml
+++ b/src/qml/imports/QFieldControls/+Qt6/CodeReader.qml
@@ -285,8 +285,8 @@ Popup {
           iconColor: "white"
           bgcolor: Theme.darkGraySemiOpaque
 
-          visible: settings.cameraActive && cameraLoader.item.camera.isTorchModeSupported(Camera.TorchOn)
-          state: cameraLoader.item.camera.torchMode === Camera.TorchOn ? "On" : "Off"
+          visible: settings.cameraActive && cameraLoader.active && cameraLoader.item.camera.isTorchModeSupported(Camera.TorchOn)
+          state: cameraLoader.active &&  cameraLoader.item.camera.torchMode === Camera.TorchOn ? "On" : "Off"
           states: [
             State {
               name: "Off"
diff --git a/src/qml/qgismobileapp.qml b/src/qml/qgismobileapp.qml
index acdff368c7..62e0e8dc06 100644
--- a/src/qml/qgismobileapp.qml
+++ b/src/qml/qgismobileapp.qml
@@ -156,8 +156,8 @@ ApplicationWindow {
     state: "browse"
   }
 
-  onChangeMode: {
-    if ( stateMachine.state == mode )
+  onChangeMode: (mode) => {
+    if ( stateMachine.state === mode )
       return
 
     stateMachine.lastState = stateMachine.state
@@ -1262,7 +1262,7 @@ ApplicationWindow {
     CloseTool {
       id: abortRequestGeometry
       visible: digitizingToolbar.geometryRequested
-      toolImage: Theme.getThemeVectorIcon( "ic_edit_geometry_white" )
+      toolImage: Theme.getThemeIcon( "ic_edit_geometry_white" )
       toolText: qsTr( 'Cancel addition' )
       onClosedTool: digitizingToolbar.cancel()
     }