diff --git a/app/src/main/java/com/fastaccess/ui/modules/settings/LanguageBottomSheetDialog.java b/app/src/main/java/com/fastaccess/ui/modules/settings/LanguageBottomSheetDialog.java
index a5cc93f9..c97a7f16 100644
--- a/app/src/main/java/com/fastaccess/ui/modules/settings/LanguageBottomSheetDialog.java
+++ b/app/src/main/java/com/fastaccess/ui/modules/settings/LanguageBottomSheetDialog.java
@@ -76,8 +76,8 @@ public class LanguageBottomSheetDialog extends BaseBottomSheetDialog {
         super.onViewCreated(view, savedInstanceState);
         int selected = Arrays.asList(values).indexOf(PrefHelper.getString("app_language"));
         String language = PrefHelper.getString("app_language");
-        cancel.setText(R.string.no);
-        ok.setText(R.string.yes);
+        cancel.setText(R.string.cancel);
+        ok.setText(R.string.ok);
 
         for (int i = 0; i < names.length; i++) {
             RadioButton radioButtonView = new RadioButton(getContext());
diff --git a/app/src/main/res/layout/picker_dialog.xml b/app/src/main/res/layout/picker_dialog.xml
index 2c0500e5..be77e496 100644
--- a/app/src/main/res/layout/picker_dialog.xml
+++ b/app/src/main/res/layout/picker_dialog.xml
@@ -22,7 +22,7 @@
             android:padding="@dimen/spacing_xs_large"
             android:textColor="?android:textColorPrimary"
             android:textStyle="bold"
-            tools:text="@string/language"/>
+            android:text="@string/language"/>
 
 
         <android.support.v4.widget.NestedScrollView