diff --git a/lib/components/matrix.dart b/lib/components/matrix.dart
index 330e4f46..be096dd1 100644
--- a/lib/components/matrix.dart
+++ b/lib/components/matrix.dart
@@ -135,6 +135,8 @@ class MatrixState extends State<Matrix> with WidgetsBindingObserver {
         final input = await showTextInputDialog(
           context: context,
           title: L10n.of(context).pleaseEnterYourPassword,
+          okLabel: L10n.of(context).ok,
+          cancelLabel: L10n.of(context).cancel,
           textFields: [
             DialogTextField(
               minLines: 1,
diff --git a/lib/views/chat.dart b/lib/views/chat.dart
index 0d7342e3..dcd12ab3 100644
--- a/lib/views/chat.dart
+++ b/lib/views/chat.dart
@@ -324,6 +324,8 @@ class _ChatState extends State<Chat> {
     final reason = await showTextInputDialog(
         context: context,
         title: L10n.of(context).whyDoYouWantToReportThis,
+        okLabel: L10n.of(context).ok,
+        cancelLabel: L10n.of(context).cancel,
         textFields: [DialogTextField(hintText: L10n.of(context).reason)]);
     if (reason == null || reason.single.isEmpty) return;
     final result = await showFutureLoadingDialog(
diff --git a/lib/views/chat_details.dart b/lib/views/chat_details.dart
index d7e87f07..75711902 100644
--- a/lib/views/chat_details.dart
+++ b/lib/views/chat_details.dart
@@ -37,6 +37,8 @@ class _ChatDetailsState extends State<ChatDetails> {
     final input = await showTextInputDialog(
       context: context,
       title: L10n.of(context).changeTheNameOfTheGroup,
+      okLabel: L10n.of(context).ok,
+      cancelLabel: L10n.of(context).cancel,
       textFields: [
         DialogTextField(
           initialText: room.getLocalizedDisplayname(
@@ -63,6 +65,8 @@ class _ChatDetailsState extends State<ChatDetails> {
     final input = await showTextInputDialog(
       context: context,
       title: L10n.of(context).setInvitationLink,
+      okLabel: L10n.of(context).ok,
+      cancelLabel: L10n.of(context).cancel,
       textFields: [
         DialogTextField(
           hintText: '#localpart:domain',
@@ -103,6 +107,8 @@ class _ChatDetailsState extends State<ChatDetails> {
     final input = await showTextInputDialog(
       context: context,
       title: L10n.of(context).setGroupDescription,
+      okLabel: L10n.of(context).ok,
+      cancelLabel: L10n.of(context).cancel,
       textFields: [
         DialogTextField(
           hintText: L10n.of(context).setGroupDescription,
diff --git a/lib/views/chat_list.dart b/lib/views/chat_list.dart
index 5109f0b6..c8ae866f 100644
--- a/lib/views/chat_list.dart
+++ b/lib/views/chat_list.dart
@@ -132,6 +132,8 @@ class _ChatListState extends State<ChatList> {
     final input = await showTextInputDialog(
         context: context,
         title: L10n.of(context).setStatus,
+          okLabel: L10n.of(context).ok,
+          cancelLabel: L10n.of(context).cancel,
         textFields: [
           DialogTextField(
             hintText: L10n.of(context).statusExampleMessage,
diff --git a/lib/views/discover.dart b/lib/views/discover.dart
index 9890d26b..6176607d 100644
--- a/lib/views/discover.dart
+++ b/lib/views/discover.dart
@@ -89,6 +89,8 @@ class _DiscoverState extends State<Discover> {
     final newServer = await showTextInputDialog(
         title: L10n.of(context).changeTheHomeserver,
         context: context,
+        okLabel: L10n.of(context).ok,
+        cancelLabel: L10n.of(context).cancel,
         textFields: [
           DialogTextField(
             prefixText: 'https://',
diff --git a/lib/views/login.dart b/lib/views/login.dart
index 017c1d41..b326ec17 100644
--- a/lib/views/login.dart
+++ b/lib/views/login.dart
@@ -94,6 +94,8 @@ class _LoginState extends State<Login> {
     final input = await showTextInputDialog(
       context: context,
       title: L10n.of(context).enterAnEmailAddress,
+      okLabel: L10n.of(context).ok,
+      cancelLabel: L10n.of(context).cancel,
       textFields: [
         DialogTextField(
           hintText: L10n.of(context).enterAnEmailAddress,
@@ -122,6 +124,8 @@ class _LoginState extends State<Login> {
     final password = await showTextInputDialog(
       context: context,
       title: L10n.of(context).chooseAStrongPassword,
+      okLabel: L10n.of(context).ok,
+      cancelLabel: L10n.of(context).cancel,
       textFields: [
         DialogTextField(
           hintText: '******',
diff --git a/lib/views/settings.dart b/lib/views/settings.dart
index f5c06252..4b9f2a00 100644
--- a/lib/views/settings.dart
+++ b/lib/views/settings.dart
@@ -61,6 +61,8 @@ class _SettingsState extends State<Settings> {
     final input = await showTextInputDialog(
       context: context,
       title: L10n.of(context).changePassword,
+      okLabel: L10n.of(context).ok,
+      cancelLabel: L10n.of(context).cancel,
       textFields: [
         DialogTextField(
           hintText: L10n.of(context).pleaseEnterYourPassword,
@@ -111,6 +113,8 @@ class _SettingsState extends State<Settings> {
     final input = await showTextInputDialog(
       context: context,
       title: L10n.of(context).pleaseEnterYourPassword,
+      okLabel: L10n.of(context).ok,
+      cancelLabel: L10n.of(context).cancel,
       textFields: [
         DialogTextField(
           obscureText: true,
@@ -139,6 +143,8 @@ class _SettingsState extends State<Settings> {
     var input = await showTextInputDialog(
       context: context,
       title: L10n.of(context).editJitsiInstance,
+      okLabel: L10n.of(context).ok,
+      cancelLabel: L10n.of(context).cancel,
       textFields: [
         DialogTextField(
           initialText: AppConfig.jitsiInstance.replaceFirst(prefix, ''),
@@ -160,6 +166,8 @@ class _SettingsState extends State<Settings> {
     final input = await showTextInputDialog(
       context: context,
       title: L10n.of(context).editDisplayname,
+      okLabel: L10n.of(context).ok,
+      cancelLabel: L10n.of(context).cancel,
       textFields: [
         DialogTextField(
           initialText: profile?.displayname ??
@@ -222,6 +230,8 @@ class _SettingsState extends State<Settings> {
     final input = await showTextInputDialog(
       context: context,
       title: L10n.of(context).askSSSSCache,
+      okLabel: L10n.of(context).ok,
+      cancelLabel: L10n.of(context).cancel,
       textFields: [
         DialogTextField(
           hintText: L10n.of(context).passphraseOrKey,
@@ -285,6 +295,7 @@ class _SettingsState extends State<Settings> {
       context: context,
       title: L10n.of(context).pleaseChooseAPasscode,
       message: L10n.of(context).pleaseEnter4Digits,
+      cancelLabel: L10n.of(context).cancel,
       textFields: [
         DialogTextField(
           validator: (text) {
diff --git a/lib/views/settings_3pid.dart b/lib/views/settings_3pid.dart
index 2b4aea5d..985e8554 100644
--- a/lib/views/settings_3pid.dart
+++ b/lib/views/settings_3pid.dart
@@ -17,6 +17,8 @@ class _Settings3PidState extends State<Settings3Pid> {
     final input = await showTextInputDialog(
       context: context,
       title: L10n.of(context).enterAnEmailAddress,
+      okLabel: L10n.of(context).ok,
+      cancelLabel: L10n.of(context).cancel,
       textFields: [
         DialogTextField(
           hintText: L10n.of(context).enterAnEmailAddress,
@@ -45,6 +47,8 @@ class _Settings3PidState extends State<Settings3Pid> {
     final password = await showTextInputDialog(
       context: context,
       title: L10n.of(context).pleaseEnterYourPassword,
+      okLabel: L10n.of(context).ok,
+      cancelLabel: L10n.of(context).cancel,
       textFields: [
         DialogTextField(
           hintText: '******',
diff --git a/lib/views/settings_devices.dart b/lib/views/settings_devices.dart
index a3d43a8a..cd4c38c0 100644
--- a/lib/views/settings_devices.dart
+++ b/lib/views/settings_devices.dart
@@ -66,6 +66,8 @@ class DevicesSettingsState extends State<DevicesSettings> {
     final displayName = await showTextInputDialog(
       context: context,
       title: L10n.of(context).changeDeviceName,
+      okLabel: L10n.of(context).ok,
+      cancelLabel: L10n.of(context).cancel,
       textFields: [
         DialogTextField(
           hintText: device.displayName,