diff --git a/app/src/main/java/io/homeassistant/companion/android/widgets/camera/CameraWidgetConfigureActivity.kt b/app/src/main/java/io/homeassistant/companion/android/widgets/camera/CameraWidgetConfigureActivity.kt
index ecd7bd13497..b93295be94f 100755
--- a/app/src/main/java/io/homeassistant/companion/android/widgets/camera/CameraWidgetConfigureActivity.kt
+++ b/app/src/main/java/io/homeassistant/companion/android/widgets/camera/CameraWidgetConfigureActivity.kt
@@ -224,7 +224,7 @@ class CameraWidgetConfigureActivity : BaseWidgetConfigureActivity() {
     }
 
     private fun initTapActionsSpinner() {
-        val tapActionValues = listOf(getString(commonR.string.refresh), getString(commonR.string.state_open))
+        val tapActionValues = listOf(getString(commonR.string.refresh), getString(commonR.string.widget_tap_action_open))
         binding.tapActionList.adapter = ArrayAdapter(this, R.layout.simple_spinner_dropdown_item, tapActionValues)
     }
 
diff --git a/app/src/main/res/layout/fragment_mobile_app_integration.xml b/app/src/main/res/layout/fragment_mobile_app_integration.xml
deleted file mode 100644
index 3fa794e316d..00000000000
--- a/app/src/main/res/layout/fragment_mobile_app_integration.xml
+++ /dev/null
@@ -1,141 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ViewFlipper xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/viewFlipper"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-    <ScrollView
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:padding="@dimen/activity_margin"
-            android:orientation="vertical">
-
-            <androidx.appcompat.widget.AppCompatTextView
-                style="@style/TextAppearance.HomeAssistant.Headline"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/activity_margin"
-                android:text="@string/connect_to_home_assistant"
-                android:textAlignment="center" />
-
-            <com.google.android.material.textfield.TextInputLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/activity_margin"
-                android:hint="@string/device_name">
-
-                <com.google.android.material.textfield.TextInputEditText
-                    android:id="@+id/deviceName"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content" />
-
-            </com.google.android.material.textfield.TextInputLayout>
-
-            <com.google.android.material.switchmaterial.SwitchMaterial
-                android:id="@+id/locationTracking"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/activity_margin"
-                android:text="@string/enable_location_tracking"/>
-
-            <androidx.appcompat.widget.AppCompatTextView
-                android:id="@+id/location_background_summary"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginEnd="50dp"
-                android:text="@string/enable_location_tracking_description" />
-
-            <androidx.appcompat.widget.AppCompatTextView
-                android:id="@+id/privacy"
-                android:layout_marginTop="@dimen/activity_margin"
-                android:autoLink="web"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:gravity="center"
-                android:text="@string/privacy_url" />
-
-            <RelativeLayout
-                android:layout_width="match_parent"
-                android:layout_height="0dp"
-                android:layout_weight="1"
-                android:layout_marginTop="@dimen/activity_margin" >
-
-                <androidx.appcompat.widget.AppCompatButton
-                    android:id="@+id/finish"
-                    style="@style/Widget.HomeAssistant.Button.Outlined"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_alignParentEnd="true"
-                    android:text="@string/finish" />
-            </RelativeLayout>
-        </LinearLayout>
-    </ScrollView>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:gravity="center"
-        android:orientation="vertical">
-
-        <androidx.appcompat.widget.AppCompatTextView
-            style="@style/TextAppearance.HomeAssistant.Headline"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/attempting_registration"
-            android:textAlignment="center" />
-
-        <androidx.core.widget.ContentLoadingProgressBar
-            style="?android:attr/progressBarStyleLarge"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="100dp" />
-
-    </LinearLayout>
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:padding="@dimen/activity_margin">
-
-        <androidx.appcompat.widget.AppCompatTextView
-            android:id="@+id/title"
-            style="@style/TextAppearance.HomeAssistant.Title"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/unable_to_register"
-            android:textAlignment="center"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintLeft_toLeftOf="parent"
-            app:layout_constraintRight_toRightOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintVertical_bias="0.35" />
-
-        <androidx.appcompat.widget.AppCompatTextView
-            android:id="@+id/subtitle"
-            style="@style/TextAppearance.HomeAssistant.Medium"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="25dp"
-            android:text="@string/error_with_registration"
-            android:textAlignment="center"
-            app:layout_constraintLeft_toLeftOf="parent"
-            app:layout_constraintRight_toRightOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/title" />
-
-        <androidx.appcompat.widget.AppCompatButton
-            android:id="@+id/retry"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="40dp"
-            android:text="@string/retry"
-            app:layout_constraintLeft_toLeftOf="parent"
-            app:layout_constraintRight_toRightOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/subtitle" />
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-</ViewFlipper>
\ No newline at end of file
diff --git a/common/src/main/res/values/strings.xml b/common/src/main/res/values/strings.xml
index 5a1d0bd1c03..16e9ada780a 100644
--- a/common/src/main/res/values/strings.xml
+++ b/common/src/main/res/values/strings.xml
@@ -119,7 +119,7 @@
     <string name="basic_sensor_name_wifi">WiFi connection</string>
     <string name="basic_sensor_name_hotspot_state">Hotspot state</string>
     <string name="binary_sensor">Binary sensor</string>
-    <string name="biometric_message">Unlock using your biometric or screen lock credential</string>
+    <string name="biometric_message">Unlock using your biometric or screen lock credentials</string>
     <string name="biometric_set_title">Confirm to continue</string>
     <string name="biometric_title">Home Assistant is locked</string>
     <string name="brightness">Brightness: %1$d%%</string>
@@ -279,7 +279,6 @@
     <string name="filter_sensors_enabled">Enabled sensors</string>
     <string name="filter_sensors_disabled">Disabled sensors</string>
     <string name="filter_updates">Filter updates</string>
-    <string name="finish">Finish</string>
     <string name="firebase_error_message">This means you will be unable to receive cloud notifications.\n\nLocal notifications will still be available via persistent connection settings in companion app settings</string>
     <string name="firebase_error_title">Firebase error</string>
     <string name="fullscreen_def">Put application in full screen</string>
@@ -403,7 +402,7 @@
     <string name="location_tracking_summary">View a history of location tracking updates to troubleshoot the device tracker</string>
     <string name="location_warn_channel">Location disabled</string>
     <string name="location">Location</string>
-    <string name="lock_summary">Use biometric or screen lock credential to unlock app</string>
+    <string name="lock_summary">Use biometric or screen lock credentials to unlock app</string>
     <string name="lock_title">Lock app</string>
     <string name="lock_home_bypass_summary">Disable app lock when connected to the home WiFi network</string>
     <string name="lock_home_bypass_title">Unlock on home WiFi</string>
@@ -578,7 +577,7 @@
     <string name="select_entity_to_display">Select entity to display</string>
     <string name="select_file">Select file</string>
     <string name="select_instance">Select your Home Assistant server</string>
-    <string name="sensor_description_active_calories_burned">Get active calories burned from Health Connect</string>
+    <string name="sensor_description_active_calories_burned">Last recorded active calories burned from Health Connect</string>
     <string name="sensor_description_active_notification_count">Total count of active notifications that are visible to the user including silent, persistent and the Sensor Worker notifications. Attributes will include the contents of all notifications if the corresponding setting is enabled. It\'s enabled by default.</string>
     <string name="sensor_description_app_importance">If the app is in the foreground, background or any other state it can be</string>
     <string name="sensor_description_android_auto">If the phone is currently connected to an Android Auto head unit</string>
@@ -655,7 +654,7 @@
     <string name="sensor_description_speakerphone">Whether speakerphone is enabled on the device</string>
     <string name="sensor_description_steps_sensor">The total number of steps since the last reboot of the device</string>
     <string name="sensor_description_storage_sensor">Information about the total and available storage space internally and externally</string>
-    <string name="sensor_description_total_calories_burned">Get total calories burned from Health Connect</string>
+    <string name="sensor_description_total_calories_burned">Total amount of calories burned since midnight from Health Connect</string>
     <string name="sensor_description_total_rx_gb">Total Rx GB since last device reboot</string>
     <string name="sensor_description_total_tx_gb">Total Tx GB since last device reboot</string>
     <string name="sensor_description_volume_alarm">Volume level for alarms on the device</string>
@@ -784,7 +783,7 @@
     <string name="session_timeout_title">Session timeout (in seconds)</string>
     <string name="set_favorite">Set favorites</string>
     <string name="set_favorites_on_device">Set favorites on Wear OS device</string>
-    <string name="set_lock_message">No biometric sensor or screen lock credential available</string>
+    <string name="set_lock_message">No biometric sensor or screen lock credentials available</string>
     <string name="set_lock_title">App locking error</string>
     <string name="setting_haptic_label">Haptics</string>
     <string name="setting_toast_label">Toast message</string>
@@ -961,7 +960,7 @@
     <string name="toast_message">%1$s was selected</string>
     <string name="toggle_flashlight">Toggle flashlight</string>
     <string name="trust_server_title">Remotely control app &amp; device</string>
-    <string name="trust_server_summary">Manage enabled sensors and use notification commands from this server</string>
+    <string name="trust_server_summary">Allow this server to enable and manage sensors and send notification commands</string>
     <string name="tts_error_utterance">Unable to process notification \"%1$s\" as text to speech.</string>
     <string name="tts_error_init">Failed to initialize a text to speech engine.</string>
     <string name="tts_no_text">Please set the text for text to speech to process</string>
@@ -1038,6 +1037,7 @@
     <string name="widget_state_separator_label">State and attribute separator:</string>
     <string name="widget_static_image_description">Entity state</string>
     <string name="widget_tap_action_label">Tap action:</string>
+    <string name="widget_tap_action_open">Open</string>
     <string name="widget_tap_action_toggle">Toggle</string>
     <string name="widget_template_error">Unable to render the template</string>
     <string name="widget_text_hint_label">Label</string>