diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/utilities/AttachmentManager.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/utilities/AttachmentManager.java
index 221e1b76c2..78b15d3c71 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/utilities/AttachmentManager.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/utilities/AttachmentManager.java
@@ -313,7 +313,7 @@ public class AttachmentManager {
 
   public void capturePhoto(Activity activity, int requestCode, Recipient recipient) {
 
-    String cameraPermissionDeniedTxt = Phrase.from(context, R.string.cameraGrantAccessDenied)
+    String cameraPermissionDeniedTxt = Phrase.from(context, R.string.permissionsCameraDenied)
             .put(APP_NAME_KEY, context.getString(R.string.app_name))
             .format().toString();
 
@@ -324,7 +324,6 @@ public class AttachmentManager {
     Permissions.with(activity)
         .request(Manifest.permission.CAMERA)
         .withPermanentDenialDialog(cameraPermissionDeniedTxt)
-        .withRationaleDialog(requireCameraPermissionTxt, R.drawable.ic_baseline_photo_camera_24)
         .onAllGranted(() -> {
           Intent captureIntent = MediaSendActivity.buildCameraIntent(activity, recipient);
           if (captureIntent.resolveActivity(activity.getPackageManager()) != null) {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/media/MediaOverviewScreen.kt b/app/src/main/java/org/thoughtcrime/securesms/media/MediaOverviewScreen.kt
index 4ce4c90a18..286bc74e93 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/media/MediaOverviewScreen.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/media/MediaOverviewScreen.kt
@@ -69,7 +69,7 @@ fun MediaOverviewScreen(
             } else {
                 Toast.makeText(
                     context,
-                    R.string.cameraGrantAccessDenied,
+                    R.string.permissionsCameraDenied,
                     Toast.LENGTH_LONG
                 ).show()
             }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendActivity.java b/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendActivity.java
index 13783729fc..3a333cd8f2 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendActivity.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendActivity.java
@@ -362,7 +362,7 @@ public class MediaSendActivity extends PassphraseRequiredActionBarActivity imple
   private void navigateToCamera() {
 
     Context c = getApplicationContext();
-    String permanentDenialTxt = Phrase.from(c, R.string.cameraGrantAccessDenied)
+    String permanentDenialTxt = Phrase.from(c, R.string.permissionsCameraDenied)
             .put(APP_NAME_KEY, c.getString(R.string.app_name))
             .format().toString();
     String requireCameraPermissionsTxt = Phrase.from(c, R.string.cameraGrantAccessDescription)
@@ -371,7 +371,6 @@ public class MediaSendActivity extends PassphraseRequiredActionBarActivity imple
 
     Permissions.with(this)
                .request(Manifest.permission.CAMERA)
-               .withRationaleDialog(requireCameraPermissionsTxt, R.drawable.ic_baseline_photo_camera_48)
                .withPermanentDenialDialog(permanentDenialTxt)
                .onAllGranted(() -> {
                  Camera1Fragment fragment = getOrCreateCameraFragment();
diff --git a/app/src/main/java/org/thoughtcrime/securesms/permissions/SettingsDialog.kt b/app/src/main/java/org/thoughtcrime/securesms/permissions/SettingsDialog.kt
index b77acfd261..bc7a1c4191 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/permissions/SettingsDialog.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/permissions/SettingsDialog.kt
@@ -11,7 +11,7 @@ class SettingsDialog {
             context.showSessionDialog {
                 title(R.string.permissionsRequired)
                 text(message)
-                button(R.string.theContinue, R.string.AccessibilityId_theContinue) {
+                button(R.string.sessionSettings, R.string.AccessibilityId_sessionSettings) {
                     context.startActivity(Permissions.getApplicationSettingsIntent(context))
                 }
                 cancelButton()
diff --git a/app/src/main/java/org/thoughtcrime/securesms/ui/components/QR.kt b/app/src/main/java/org/thoughtcrime/securesms/ui/components/QR.kt
index 0e82058679..de59f463e3 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/ui/components/QR.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/ui/components/QR.kt
@@ -137,7 +137,7 @@ fun QRScannerScreen(
             AlertDialog(
                 onDismissRequest = { showCameraPermissionDialog = false },
                 title = stringResource(R.string.permissionsRequired),
-                text = stringResource(R.string.cameraGrantAccessDenied), //todo UPDATE TO PROPER STRING !!!!!!!!!!!!!!!!!!!!!!!
+                text = stringResource(R.string.permissionsCameraDenied),
                 buttons = listOf(
                     DialogButtonModel(
                         text = GetString(stringResource(id = R.string.sessionSettings)),
diff --git a/app/src/main/res/drawable/ic_baseline_photo_camera_48.xml b/app/src/main/res/drawable/ic_baseline_photo_camera_48.xml
deleted file mode 100644
index 33acb83243..0000000000
--- a/app/src/main/res/drawable/ic_baseline_photo_camera_48.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<vector android:height="48dp" android:tint="?attr/colorControlNormal"
-    android:viewportHeight="24" android:viewportWidth="24"
-    android:width="48dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@android:color/white" android:pathData="M12,12m-3.2,0a3.2,3.2 0,1 1,6.4 0a3.2,3.2 0,1 1,-6.4 0"/>
-    <path android:fillColor="@android:color/white" android:pathData="M9,2L7.17,4L4,4c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,6c0,-1.1 -0.9,-2 -2,-2h-3.17L15,2L9,2zM12,17c-2.76,0 -5,-2.24 -5,-5s2.24,-5 5,-5 5,2.24 5,5 -2.24,5 -5,5z"/>
-</vector>
diff --git a/libsession/src/main/java/org/session/libsession/messaging/utilities/UpdateMessageBuilder.kt b/libsession/src/main/java/org/session/libsession/messaging/utilities/UpdateMessageBuilder.kt
index dc85b58e77..d63dd347a2 100644
--- a/libsession/src/main/java/org/session/libsession/messaging/utilities/UpdateMessageBuilder.kt
+++ b/libsession/src/main/java/org/session/libsession/messaging/utilities/UpdateMessageBuilder.kt
@@ -43,7 +43,7 @@ object UpdateMessageBuilder {
             // --- Group created or joined ---
             is UpdateMessageData.Kind.GroupCreation -> {
                 if (!isOutgoing) {
-                    context.getText(R.string.groupInviteYou)
+                    context.getText(R.string.legacyGroupMemberYouNew)
                 } else {
                     "" // We no longer add a string like `disappearingMessagesNewGroup` ("You created a new group") and leave the group with its default empty state
                 }
@@ -69,19 +69,19 @@ object UpdateMessageBuilder {
                         return ""
                     }
                     1 -> {
-                        Phrase.from(context, R.string.groupMemberNew)
+                        Phrase.from(context, R.string.legacyGroupMemberNew)
                             .put(NAME_KEY, getSenderName(updateData.updatedMembers.elementAt(0)))
                             .format()
                     }
                     2 -> {
-                        Phrase.from(context, R.string.groupMemberNewTwo)
+                        Phrase.from(context, R.string.legacyGroupMemberTwoNew)
                             .put(NAME_KEY, getSenderName(updateData.updatedMembers.elementAt(0)))
                             .put(OTHER_NAME_KEY, getSenderName(updateData.updatedMembers.elementAt(1)))
                             .format()
                     }
                     else -> {
                         val newMemberCountMinusOne = newMemberCount - 1
-                        Phrase.from(context, R.string.groupMemberNewMultiple)
+                        Phrase.from(context, R.string.legacyGroupMemberNewMultiple)
                             .put(NAME_KEY, getSenderName(updateData.updatedMembers.elementAt(0)))
                             .put(COUNT_KEY, newMemberCountMinusOne)
                             .format()
diff --git a/libsession/src/main/res/values/strings.xml b/libsession/src/main/res/values/strings.xml
index e1effe3ee6..fbb869372c 100644
--- a/libsession/src/main/res/values/strings.xml
+++ b/libsession/src/main/res/values/strings.xml
@@ -163,6 +163,7 @@
     <string name="cameraErrorUnavailable">Camera unavailable.</string>
     <string name="cameraGrantAccess">Grant Camera Access</string>
     <string name="cameraGrantAccessDenied">{app_name} needs camera access to take photos and videos, but it has been permanently denied. Please continue to app settings, select \"Permissions\", and enable \"Camera\".</string>
+    <string name="permissionsCameraDenied">{app_name} needs camera access to take photos and videos, but it has been permanently denied. Tap Settings -> Permissions and turn \"Camera\" on.</string>
     <string name="cameraGrantAccessDescription">{app_name} needs camera access to take photos and videos, or scan QR codes.</string>
     <string name="cameraGrantAccessQr">{app_name} needs camera access to scan QR codes</string>
     <string name="cancel">Cancel</string>