diff --git a/app/src/main/java/protect/card_locker/ScanActivity.java b/app/src/main/java/protect/card_locker/ScanActivity.java
index ae24ac7ad..9c177751e 100644
--- a/app/src/main/java/protect/card_locker/ScanActivity.java
+++ b/app/src/main/java/protect/card_locker/ScanActivity.java
@@ -422,7 +422,7 @@ public class ScanActivity extends CatimaAppCompatActivity {
     }
 
     private void showCameraError(String message, boolean setOnClick) {
-        customBarcodeScannerBinding.cameraPermissionDeniedLayout.cameraPermissionDeniedMessage.setText(message);
+        customBarcodeScannerBinding.cameraErrorLayout.cameraErrorMessage.setText(message);
 
         setCameraErrorState(true, setOnClick);
     }
@@ -434,11 +434,11 @@ public class ScanActivity extends CatimaAppCompatActivity {
     private void setCameraErrorState(boolean visible, boolean setOnClick) {
         mHasError = visible;
 
-        customBarcodeScannerBinding.cameraPermissionDeniedLayout.cameraPermissionDeniedClickableArea.setOnClickListener(visible && setOnClick ? v -> {
+        customBarcodeScannerBinding.cameraErrorLayout.cameraErrorClickableArea.setOnClickListener(visible && setOnClick ? v -> {
             navigateToSystemPermissionSetting();
         } : null);
         customBarcodeScannerBinding.cardInputContainer.setBackgroundColor(visible ? obtainThemeAttribute(com.google.android.material.R.attr.colorSurface) : Color.TRANSPARENT);
-        customBarcodeScannerBinding.cameraPermissionDeniedLayout.getRoot().setVisibility(visible ? View.VISIBLE : View.GONE);
+        customBarcodeScannerBinding.cameraErrorLayout.getRoot().setVisibility(visible ? View.VISIBLE : View.GONE);
     }
 
     private void scaleScreen() {
@@ -448,8 +448,8 @@ public class ScanActivity extends CatimaAppCompatActivity {
         float mediumSizePx = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP,MEDIUM_SCALE_FACTOR_DIP,getResources().getDisplayMetrics());
         boolean shouldScaleSmaller = screenHeight < mediumSizePx;
 
-        customBarcodeScannerBinding.cameraPermissionDeniedLayout.cameraPermissionDeniedIcon.setVisibility(shouldScaleSmaller ? View.GONE : View.VISIBLE);
-        customBarcodeScannerBinding.cameraPermissionDeniedLayout.cameraPermissionDeniedTitle.setVisibility(shouldScaleSmaller ? View.GONE : View.VISIBLE);
+        customBarcodeScannerBinding.cameraErrorLayout.cameraErrorIcon.setVisibility(shouldScaleSmaller ? View.GONE : View.VISIBLE);
+        customBarcodeScannerBinding.cameraErrorLayout.cameraErrorTitle.setVisibility(shouldScaleSmaller ? View.GONE : View.VISIBLE);
     }
 
     private int obtainThemeAttribute(int attribute) {
diff --git a/app/src/main/res/drawable/camera_permission_denied.xml b/app/src/main/res/drawable/camera_error.xml
similarity index 100%
rename from app/src/main/res/drawable/camera_permission_denied.xml
rename to app/src/main/res/drawable/camera_error.xml
diff --git a/app/src/main/res/layout/camera_permission_failed_layout.xml b/app/src/main/res/layout/camera_error_layout.xml
similarity index 76%
rename from app/src/main/res/layout/camera_permission_failed_layout.xml
rename to app/src/main/res/layout/camera_error_layout.xml
index 2d47929a6..8e3d823ea 100644
--- a/app/src/main/res/layout/camera_permission_failed_layout.xml
+++ b/app/src/main/res/layout/camera_error_layout.xml
@@ -9,20 +9,20 @@
     tools:showIn="@layout/custom_barcode_scanner">
 
     <LinearLayout
-        android:id="@+id/camera_permission_denied_clickable_area"
+        android:id="@+id/camera_error_clickable_area"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical">
 
         <ImageView
-            android:id="@+id/camera_permission_denied_icon"
+            android:id="@+id/camera_error_icon"
             android:layout_width="match_parent"
             android:layout_height="84dp"
             android:scaleType="fitCenter"
-            android:src="@drawable/camera_permission_denied" />
+            android:src="@drawable/camera_error" />
 
         <TextView
-            android:id="@+id/camera_permission_denied_title"
+            android:id="@+id/camera_error_title"
             style="@style/TextAppearance.Material3.HeadlineLarge"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -30,12 +30,12 @@
             android:text="@string/cameraPermissionDeniedTitle" />
 
         <TextView
-            android:id="@+id/camera_permission_denied_message"
+            android:id="@+id/camera_error_message"
             style="@style/AppTheme.TextView.NoData"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:gravity="center"
-            android:text="@string/noCameraPermissionDirectToSystemSetting" />
+            android:text="@string/zxing_msg_camera_framework_bug" />
     </LinearLayout>
 
 </RelativeLayout>
diff --git a/app/src/main/res/layout/custom_barcode_scanner.xml b/app/src/main/res/layout/custom_barcode_scanner.xml
index d197ffde5..3ab8c96a0 100644
--- a/app/src/main/res/layout/custom_barcode_scanner.xml
+++ b/app/src/main/res/layout/custom_barcode_scanner.xml
@@ -34,8 +34,8 @@
         android:padding="@dimen/activity_scanner_padding">
 
         <include
-            android:id="@+id/camera_permission_denied_layout"
-            layout="@layout/camera_permission_failed_layout"
+            android:id="@+id/camera_error_layout"
+            layout="@layout/camera_error_layout"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:visibility="gone"