diff --git a/calculatorpp/res/values-large/dimens.xml b/calculatorpp/res/values-large/dimens.xml
index a63eddf6..be3c703a 100644
--- a/calculatorpp/res/values-large/dimens.xml
+++ b/calculatorpp/res/values-large/dimens.xml
@@ -4,7 +4,11 @@
 
     <dimen name="cpp_editor_text_size">25sp</dimen>
     <dimen name="cpp_display_text_size">25sp</dimen>
-    <dimen name="cpp_button_text_size_mobile">35dp</dimen>
+
+    <dimen name="cpp_keyboard_button_text_size_mobile">35dp</dimen>
+    <dimen name="cpp_display_text_size_mobile">35sp</dimen>
+    <dimen name="cpp_editor_text_size_mobile">35sp</dimen>
+
     <dimen name="cpp_keyboard_button_text_size">40dp</dimen>
     <dimen name="cpp_math_entity_text_size">25sp</dimen>
     <dimen name="cpp_math_entity_description_text_size">20sp</dimen>
diff --git a/calculatorpp/res/values-xlarge/dimens.xml b/calculatorpp/res/values-xlarge/dimens.xml
index 1e5865e7..c395eb6e 100644
--- a/calculatorpp/res/values-xlarge/dimens.xml
+++ b/calculatorpp/res/values-xlarge/dimens.xml
@@ -4,7 +4,11 @@
 
     <dimen name="cpp_editor_text_size">30sp</dimen>
     <dimen name="cpp_display_text_size">30sp</dimen>
-    <dimen name="cpp_button_text_size_mobile">65dp</dimen>
+
+    <dimen name="cpp_keyboard_button_text_size_mobile">75dp</dimen>
+    <dimen name="cpp_display_text_size_mobile">75sp</dimen>
+    <dimen name="cpp_editor_text_size_mobile">75sp</dimen>
+
     <dimen name="cpp_keyboard_button_text_size">40dp</dimen>
     <dimen name="cpp_math_entity_text_size">30sp</dimen>
     <dimen name="cpp_math_entity_description_text_size">20sp</dimen>
diff --git a/calculatorpp/res/values/dimens.xml b/calculatorpp/res/values/dimens.xml
index e0332951..b9a22b58 100644
--- a/calculatorpp/res/values/dimens.xml
+++ b/calculatorpp/res/values/dimens.xml
@@ -8,7 +8,11 @@
 
     <dimen name="cpp_keyboard_button_text_size">30dp</dimen>
     <dimen name="cpp_button_text_size">20dp</dimen>
-    <dimen name="cpp_button_text_size_mobile">25dp</dimen>
+
+    <dimen name="cpp_keyboard_button_text_size_mobile">20dp</dimen>
+    <dimen name="cpp_display_text_size_mobile">25sp</dimen>
+    <dimen name="cpp_editor_text_size_mobile">25sp</dimen>
+
     <dimen name="cpp_display_text_size">25sp</dimen>
     <dimen name="cpp_editor_text_size">25sp</dimen>
     <dimen name="cpp_pane_margin">5dp</dimen>
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/AndroidCalculatorDisplayView.java b/calculatorpp/src/main/java/org/solovyev/android/calculator/AndroidCalculatorDisplayView.java
index 997eea5a..9c038f73 100644
--- a/calculatorpp/src/main/java/org/solovyev/android/calculator/AndroidCalculatorDisplayView.java
+++ b/calculatorpp/src/main/java/org/solovyev/android/calculator/AndroidCalculatorDisplayView.java
@@ -6,8 +6,10 @@
 package org.solovyev.android.calculator;
 
 import android.content.Context;
+import android.content.SharedPreferences;
 import android.graphics.Color;
 import android.os.Handler;
+import android.preference.PreferenceManager;
 import android.text.Html;
 import android.util.AttributeSet;
 import org.jetbrains.annotations.NotNull;
@@ -167,6 +169,12 @@ public class AndroidCalculatorDisplayView extends AutoResizeTextView implements
 
     public synchronized void init(@NotNull Context context) {
         if (!initialized) {
+            final SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(context);
+            final CalculatorPreferences.Gui.Layout layout = CalculatorPreferences.Gui.getLayout(preferences);
+            if ( layout == CalculatorPreferences.Gui.Layout.main_calculator_mobile ) {
+                setTextSize(getResources().getDimension(R.dimen.cpp_display_text_size_mobile));
+            }
+
             this.setOnClickListener(new CalculatorDisplayOnClickListener(context));
 
             this.initialized = true;
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/AndroidCalculatorEditorView.java b/calculatorpp/src/main/java/org/solovyev/android/calculator/AndroidCalculatorEditorView.java
index c2711fb5..3a7f081d 100644
--- a/calculatorpp/src/main/java/org/solovyev/android/calculator/AndroidCalculatorEditorView.java
+++ b/calculatorpp/src/main/java/org/solovyev/android/calculator/AndroidCalculatorEditorView.java
@@ -141,6 +141,11 @@ public class AndroidCalculatorEditorView extends EditText implements SharedPrefe
         if (!initialized) {
             final SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(context);
 
+            final CalculatorPreferences.Gui.Layout layout = CalculatorPreferences.Gui.getLayout(preferences);
+            if ( layout == CalculatorPreferences.Gui.Layout.main_calculator_mobile ) {
+                setTextSize(getResources().getDimension(R.dimen.cpp_editor_text_size_mobile));
+            }
+
             preferences.registerOnSharedPreferenceChangeListener(this);
 
             this.addTextChangedListener(new TextWatcherImpl());
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorButtons.java b/calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorButtons.java
index 835500b2..db2dad20 100644
--- a/calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorButtons.java
+++ b/calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorButtons.java
@@ -39,7 +39,7 @@ public final class CalculatorButtons {
                                       @NotNull View root) {
         if ( layout == CalculatorPreferences.Gui.Layout.main_calculator_mobile ) {
 
-            final float textSize = root.getResources().getDimension(R.dimen.cpp_button_text_size_mobile);
+            final float textSize = root.getResources().getDimension(R.dimen.cpp_keyboard_button_text_size_mobile);
 
             AndroidUtils.processViewsOfType(root, DragButton.class, new AndroidUtils.ViewProcessor<DragButton>() {
                 @Override