diff --git a/src/app/commoncomponents/ConfirmDialog.qml b/src/app/commoncomponents/ConfirmDialog.qml
index 70f5e56164c7466a630e4adb28de9703b801e86e..28d5eb7b10b7dadb1242ee2dc4140def42182989 100644
--- a/src/app/commoncomponents/ConfirmDialog.qml
+++ b/src/app/commoncomponents/ConfirmDialog.qml
@@ -29,8 +29,8 @@ BaseModalDialog {
 
     signal accepted
 
-    width: JamiTheme.preferredDialogWidth
-    height: JamiTheme.preferredDialogHeight
+    width: Math.min(mainView.width - 2 * JamiTheme.preferredMarginSize, JamiTheme.preferredDialogWidth)
+    height: Math.min(mainView.height - 2 * JamiTheme.preferredMarginSize, JamiTheme.preferredDialogHeight)
 
     property var confirmLabel: ""
     property var textLabel: ""
diff --git a/src/app/commoncomponents/DeleteAccountDialog.qml b/src/app/commoncomponents/DeleteAccountDialog.qml
index 11dc76edd0a5deaccd02d12c118497c87b9a101b..e47a5ea219f6db65c6c716939208801599021744 100644
--- a/src/app/commoncomponents/DeleteAccountDialog.qml
+++ b/src/app/commoncomponents/DeleteAccountDialog.qml
@@ -35,8 +35,8 @@ BaseModalDialog {
 
     title: JamiStrings.deleteAccount
 
-    width: JamiTheme.preferredDialogWidth
-    height: JamiTheme.preferredDialogHeight
+    width: Math.min(mainView.width - 2 * JamiTheme.preferredMarginSize, JamiTheme.preferredDialogWidth)
+    height: Math.min(mainView.height - 2 * JamiTheme.preferredMarginSize, JamiTheme.preferredDialogHeight)
 
     popupContent: ColumnLayout {
         id: deleteAccountContentColumnLayout
diff --git a/src/app/commoncomponents/PasswordDialog.qml b/src/app/commoncomponents/PasswordDialog.qml
index 821d13d027df232bff9f4fde6355c866c0595c3c..b5b8392ebf2aa24c1ad9bfe9b27973642dde563f 100644
--- a/src/app/commoncomponents/PasswordDialog.qml
+++ b/src/app/commoncomponents/PasswordDialog.qml
@@ -44,8 +44,8 @@ BaseModalDialog {
         open()
     }
 
-    height: JamiTheme.preferredDialogHeight
-    width: JamiTheme.preferredDialogWidth
+    width: Math.min(mainView.width - 2 * JamiTheme.preferredMarginSize, JamiTheme.preferredDialogWidth)
+    height: Math.min(mainView.height - 2 * JamiTheme.preferredMarginSize, JamiTheme.preferredDialogHeight)
 
     title: {
         switch(purpose){
diff --git a/src/app/constant/JamiStrings.qml b/src/app/constant/JamiStrings.qml
index c40e484e05f7724f5782ac6d02b936de964be1a8..ad830bc83e8c4731e2c7eee0266a4dda7ea8d82e 100644
--- a/src/app/constant/JamiStrings.qml
+++ b/src/app/constant/JamiStrings.qml
@@ -263,8 +263,8 @@ Item {
     property string clearConversation: qsTr("Clear conversation")
     property string confirmAction: qsTr("Confirm action")
     property string removeConversation: qsTr("Remove conversation")
-    property string confirmRmConversation: qsTr("Do you really want to remove this conversation")
-    property string confirmBlockConversation: qsTr("Do you really want to block this conversation")
+    property string confirmRmConversation: qsTr("Do you really want to remove this conversation?")
+    property string confirmBlockConversation: qsTr("Do you really want to block this conversation?")
     property string removeContact: qsTr("Remove contact")
     property string blockContact: qsTr("Block contact")
     property string blockSwarm: qsTr("Block swarm")
@@ -676,6 +676,7 @@ Item {
     property string optionUpgrade: qsTr("Upgrade")
     property string optionLater: qsTr("Later")
     property string optionDelete: qsTr("Delete")
+    property string optionRemove: qsTr("Remove")
     property string optionBlock: qsTr("Block")
 
     // Conference moderation
diff --git a/src/app/mainview/components/ConversationSmartListContextMenu.qml b/src/app/mainview/components/ConversationSmartListContextMenu.qml
index d73b3fe6b715c4f40ac3492e0e273e0b083a7047..45f2020b24db5a37dd1a6c0a22cded1be40ecd29 100644
--- a/src/app/mainview/components/ConversationSmartListContextMenu.qml
+++ b/src/app/mainview/components/ConversationSmartListContextMenu.qml
@@ -35,7 +35,7 @@ ContextMenuAutoLoader {
 
         title: JamiStrings.confirmAction
         textLabel: JamiStrings.confirmRmConversation
-        confirmLabel: JamiStrings.optionDelete
+        confirmLabel: JamiStrings.optionRemove
         onAccepted: {
             if (isSwarm)
                 MessagesAdapter.removeConversation(responsibleConvUid)
diff --git a/src/app/settingsview/components/LinkDeviceDialog.qml b/src/app/settingsview/components/LinkDeviceDialog.qml
index c0b145f6be407e4ec208cd6d2473018f901999fe..379cb876eb02b5c81b6a78342d37728b472a406b 100644
--- a/src/app/settingsview/components/LinkDeviceDialog.qml
+++ b/src/app/settingsview/components/LinkDeviceDialog.qml
@@ -34,8 +34,8 @@ BaseModalDialog {
 
     title: JamiStrings.addDevice
 
-    width: JamiTheme.preferredDialogWidth
-    height: JamiTheme.preferredDialogHeight
+    width: Math.min(mainView.width - 2 * JamiTheme.preferredMarginSize, JamiTheme.preferredDialogWidth)
+    height: Math.min(mainView.height - 2 * JamiTheme.preferredMarginSize, JamiTheme.preferredDialogHeight)
 
     popupContent: StackLayout {
         id: stackedWidget
diff --git a/src/app/settingsview/components/NameRegistrationDialog.qml b/src/app/settingsview/components/NameRegistrationDialog.qml
index eea05665a83471d4c8f7bf267882e3442af5d254..032c7c8954d9d2f391871853082d95435336a8f4 100644
--- a/src/app/settingsview/components/NameRegistrationDialog.qml
+++ b/src/app/settingsview/components/NameRegistrationDialog.qml
@@ -40,8 +40,8 @@ BaseModalDialog {
         open()
     }
 
-    width: JamiTheme.preferredDialogWidth
-    height: JamiTheme.preferredDialogHeight
+    width: Math.min(mainView.width - 2 * JamiTheme.preferredMarginSize, JamiTheme.preferredDialogWidth)
+    height: Math.min(mainView.height - 2 * JamiTheme.preferredMarginSize, JamiTheme.preferredDialogHeight)
 
     title: JamiStrings.setUsername
 
diff --git a/src/app/settingsview/components/RevokeDevicePasswordDialog.qml b/src/app/settingsview/components/RevokeDevicePasswordDialog.qml
index 95c575dedc00cf0a58a4f7b82cb5ce4be51d6d0b..97dcdf19afa51508d62a1b1cfd937c3ecb7621c2 100644
--- a/src/app/settingsview/components/RevokeDevicePasswordDialog.qml
+++ b/src/app/settingsview/components/RevokeDevicePasswordDialog.qml
@@ -38,8 +38,8 @@ BaseModalDialog {
         open()
     }
 
-    width: JamiTheme.preferredDialogWidth
-    height: JamiTheme.preferredDialogHeight
+    width: Math.min(mainView.width - 2 * JamiTheme.preferredMarginSize, JamiTheme.preferredDialogWidth)
+    height: Math.min(mainView.height - 2 * JamiTheme.preferredMarginSize, JamiTheme.preferredDialogHeight)
 
     title: JamiStrings.removeDevice