diff --git a/app/src/main/java/com/nextcloud/client/assistant/conversation/ConversationScreen.kt b/app/src/main/java/com/nextcloud/client/assistant/conversation/ConversationScreen.kt
index 0a9a3550b548..0ea29868c489 100644
--- a/app/src/main/java/com/nextcloud/client/assistant/conversation/ConversationScreen.kt
+++ b/app/src/main/java/com/nextcloud/client/assistant/conversation/ConversationScreen.kt
@@ -46,7 +46,6 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.colorResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextAlign
@@ -63,19 +62,19 @@ import com.owncloud.android.lib.resources.assistant.chat.model.Conversation
 @Suppress("LongMethod")
 @Composable
 fun ConversationScreen(viewModel: ConversationViewModel, close: () -> Unit, openChat: (Long) -> Unit) {
-    val context = LocalContext.current
     val screenState by viewModel.screenState.collectAsState()
     val errorMessageId by viewModel.errorMessageId.collectAsState()
     val conversations by viewModel.conversations.collectAsState()
     val snackbarHostState = remember { SnackbarHostState() }
+    val errorString = errorMessageId?.let { stringResource(it) }
 
     LaunchedEffect(Unit) {
         viewModel.fetchConversations()
     }
 
-    LaunchedEffect(errorMessageId) {
-        errorMessageId?.let {
-            snackbarHostState.showSnackbar(context.getString(it))
+    LaunchedEffect(errorString) {
+        errorString?.let {
+            snackbarHostState.showSnackbar(it)
         }
     }
 
diff --git a/app/src/main/java/com/owncloud/android/ui/fragment/FileDetailsSharingProcessFragment.kt b/app/src/main/java/com/owncloud/android/ui/fragment/FileDetailsSharingProcessFragment.kt
index 6052fa51df6c..d97dfc911c40 100644
--- a/app/src/main/java/com/owncloud/android/ui/fragment/FileDetailsSharingProcessFragment.kt
+++ b/app/src/main/java/com/owncloud/android/ui/fragment/FileDetailsSharingProcessFragment.kt
@@ -44,6 +44,7 @@ import com.owncloud.android.utils.theme.CapabilityUtils
 import com.owncloud.android.utils.theme.ViewThemeUtils
 import java.text.SimpleDateFormat
 import java.util.Date
+import java.util.Locale
 import javax.inject.Inject
 
 /**
@@ -503,7 +504,9 @@ class FileDetailsSharingProcessFragment :
         val currentLimit = share?.remainingDownloadLimit() ?: return
         if (currentLimit > 0) {
             binding.shareProcessSetDownloadLimitSwitch.isChecked = true
-            binding.shareProcessSetDownloadLimitInput.setText(currentLimit.toString())
+            binding.shareProcessSetDownloadLimitInput.setText(
+                "%d".format(Locale.getDefault(), currentLimit)
+            )
         }
     }
 
diff --git a/app/src/main/res/values/dims.xml b/app/src/main/res/values/dims.xml
index b4f8d33b8ebb..3192d5eb772f 100644
--- a/app/src/main/res/values/dims.xml
+++ b/app/src/main/res/values/dims.xml
@@ -136,7 +136,6 @@
     <dimen name="button_corner_radius">24dp</dimen>
     <dimen name="status_corner_radius">12dp</dimen>
     <dimen name="backup_button_width">160dp</dimen>
-    <dimen name="settings_activity_padding">24dp</dimen>
     <integer name="media_grid_width">4</integer>
     <dimen name="account_action_button_margin">12dp</dimen>
     <dimen name="account_action_button_height">50dp</dimen>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 9df94fe5e626..eac2c70202b3 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1160,7 +1160,6 @@
     <string name="uploader_upload_failed_sync_conflict_error">File upload conflict</string>
     <string name="uploader_upload_failed_sync_conflict_error_content">Pick which version to keep of %1$s</string>
     <string name="upload_list_resolve_conflict">Resolve conflict</string>
-    <string name="upload_list_cancel_upload">Cancel upload</string>
     <string name="upload_list_delete">Delete</string>
     <string name="create_new">New</string>
     <string name="editor_placeholder" translatable="false">%1$s %2$s</string>