diff --git a/calculatorpp/res/layout/calculator_messages_dialog.xml b/calculatorpp/res/layout/calculator_messages_dialog.xml
index eb4be7a7..8708339e 100644
--- a/calculatorpp/res/layout/calculator_messages_dialog.xml
+++ b/calculatorpp/res/layout/calculator_messages_dialog.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
-    a:layout_width="match_parent"
-    a:layout_height="match_parent"
+    a:layout_width="wrap_content"
+    a:layout_height="wrap_content"
     style="?dialogStyle"
     a:orientation="vertical">
 
diff --git a/calculatorpp/res/layout/calculator_messages_dialog_message.xml b/calculatorpp/res/layout/calculator_messages_dialog_message.xml
index ce34cfcd..497f4178 100644
--- a/calculatorpp/res/layout/calculator_messages_dialog_message.xml
+++ b/calculatorpp/res/layout/calculator_messages_dialog_message.xml
@@ -3,20 +3,19 @@
 <LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
     a:layout_width="match_parent"
     a:layout_height="wrap_content"
-    a:orientation="horizontal">
+    a:orientation="horizontal"
+    a:padding="6dp">
 
     <TextView a:id="@+id/calculation_messages_text_view"
         a:layout_width="0dp"
         a:layout_height="wrap_content"
-        a:layout_weight="5"
-        a:layout_gravity="top|left"/>
+        a:layout_weight="5"/>
 
     <Button
         a:id="@+id/fix_button"
         a:layout_width="0dp"
         a:layout_height="wrap_content"
         a:layout_weight="1"
-        a:layout_gravity="top|right"
-        a:text="@string/fix" />
+        a:text="@string/fix"/>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/calculatorpp/res/values-large/dimens.xml b/calculatorpp/res/values-large/dimens.xml
index 32bfebb9..2c313dd7 100644
--- a/calculatorpp/res/values-large/dimens.xml
+++ b/calculatorpp/res/values-large/dimens.xml
@@ -4,6 +4,7 @@
 
     <dimen name="editor_text_size">25sp</dimen>
     <dimen name="display_text_size">25sp</dimen>
+    <dimen name="button_text_size_mobile">35dp</dimen>
     <dimen name="keyboard_button_text_size">40dp</dimen>
     <dimen name="math_entity_text_size">25sp</dimen>
     <dimen name="math_entity_description_text_size">20sp</dimen>
diff --git a/calculatorpp/res/values-xlarge/dimens.xml b/calculatorpp/res/values-xlarge/dimens.xml
index 58b919b7..818041ae 100644
--- a/calculatorpp/res/values-xlarge/dimens.xml
+++ b/calculatorpp/res/values-xlarge/dimens.xml
@@ -4,6 +4,7 @@
 
     <dimen name="editor_text_size">30sp</dimen>
     <dimen name="display_text_size">30sp</dimen>
+    <dimen name="button_text_size_mobile">65dp</dimen>
     <dimen name="keyboard_button_text_size">40dp</dimen>
     <dimen name="math_entity_text_size">30sp</dimen>
     <dimen name="math_entity_description_text_size">20sp</dimen>
diff --git a/calculatorpp/res/values/dimens.xml b/calculatorpp/res/values/dimens.xml
index 20c700be..ecbe19f3 100644
--- a/calculatorpp/res/values/dimens.xml
+++ b/calculatorpp/res/values/dimens.xml
@@ -8,7 +8,7 @@
 
     <dimen name="keyboard_button_text_size">30dp</dimen>
     <dimen name="button_text_size">20dp</dimen>
-    <dimen name="button_text_size_mobile">20dp</dimen>
+    <dimen name="button_text_size_mobile">25dp</dimen>
     <dimen name="display_text_size">25sp</dimen>
     <dimen name="editor_text_size">25sp</dimen>
     <dimen name="pane_margin">5dp</dimen>
diff --git a/calculatorpp/res/values/text_strings.xml b/calculatorpp/res/values/text_strings.xml
index fe0a547b..b169b736 100644
--- a/calculatorpp/res/values/text_strings.xml
+++ b/calculatorpp/res/values/text_strings.xml
@@ -248,7 +248,7 @@
     <string name="function_removal_confirmation_question">Do you really want to delete \'%s\' function?</string>
     <string name="empty_function_error">Unable to create empty function!</string>
     <string name="do_not_show_messages_in_session">Do not show this message until next session</string>
-    <string name="calculation_messages_dialog_title">Calculation messages</string>
+    <string name="calculation_messages_dialog_title">Calculator++ warning</string>
     <string name="arithmetic_error_while_plot">Arithmetic error occurred while plotting: %s</string>
     <string name="ok">OK</string>
     <string name="p_show_calculation_messages_dialog_title">Show calculation messages in dialog</string>
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/AndroidCalculatorPreferenceService.java b/calculatorpp/src/main/java/org/solovyev/android/calculator/AndroidCalculatorPreferenceService.java
index 4b2ec210..be313182 100644
--- a/calculatorpp/src/main/java/org/solovyev/android/calculator/AndroidCalculatorPreferenceService.java
+++ b/calculatorpp/src/main/java/org/solovyev/android/calculator/AndroidCalculatorPreferenceService.java
@@ -32,16 +32,16 @@ public class AndroidCalculatorPreferenceService implements CalculatorPreferenceS
 
     @Override
     public void checkPreferredPreferences(boolean force) {
-        final SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(application);
+        final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(application);
 
         final Long currentTime = System.currentTimeMillis();
 
-        if ( force || isTimeForCheck(currentTime, preferences)) {
-            final NumeralBase preferredNumeralBase = CalculatorPreferences.Calculations.preferredNumeralBase.getPreference(preferences);
-            final NumeralBase numeralBase = AndroidCalculatorEngine.Preferences.numeralBase.getPreference(preferences);
+        if ( force || ( CalculatorPreferences.Calculations.showCalculationMessagesDialog.getPreference(prefs) && isTimeForCheck(currentTime, prefs))) {
+            final NumeralBase preferredNumeralBase = CalculatorPreferences.Calculations.preferredNumeralBase.getPreference(prefs);
+            final NumeralBase numeralBase = AndroidCalculatorEngine.Preferences.numeralBase.getPreference(prefs);
 
-            final AngleUnit preferredAngleUnits = CalculatorPreferences.Calculations.preferredAngleUnits.getPreference(preferences);
-            final AngleUnit angleUnits = AndroidCalculatorEngine.Preferences.angleUnit.getPreference(preferences);
+            final AngleUnit preferredAngleUnits = CalculatorPreferences.Calculations.preferredAngleUnits.getPreference(prefs);
+            final AngleUnit angleUnits = AndroidCalculatorEngine.Preferences.angleUnit.getPreference(prefs);
 
             final List<CalculatorFixableMessage> messages = new ArrayList<CalculatorFixableMessage>(2);
             if ( numeralBase != preferredNumeralBase ) {
@@ -54,7 +54,7 @@ public class AndroidCalculatorPreferenceService implements CalculatorPreferenceS
 
             CalculatorMessagesDialog.showDialog(messages, application);
 
-            CalculatorPreferences.Calculations.lastPreferredPreferencesCheck.putPreference(preferences, currentTime);
+            CalculatorPreferences.Calculations.lastPreferredPreferencesCheck.putPreference(prefs, currentTime);
         }
     }
 
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorActivity.java b/calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorActivity.java
index b8e0b7af..251ef93f 100644
--- a/calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorActivity.java
+++ b/calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorActivity.java
@@ -79,7 +79,9 @@ public class CalculatorActivity extends SherlockFragmentActivity implements Shar
         toggleOrientationChange(preferences);
 
         preferences.registerOnSharedPreferenceChangeListener(this);
-	}
+
+        CalculatorLocatorImpl.getInstance().getPreferenceService().checkPreferredPreferences(false);
+    }
 
     @NotNull
     private AndroidCalculator getCalculator() {
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorApplication.java b/calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorApplication.java
index 86f6b121..fb0ce759 100644
--- a/calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorApplication.java
+++ b/calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorApplication.java
@@ -126,8 +126,6 @@ public class CalculatorApplication extends android.app.Application {
 
         CalculatorLocatorImpl.getInstance().getLogger().debug(TAG, "Application started!");
         CalculatorLocatorImpl.getInstance().getNotifier().showDebugMessage(TAG, "Application started!");
-
-        CalculatorLocatorImpl.getInstance().getPreferenceService().checkPreferredPreferences(true);
     }
 
     private void setTheme(@NotNull SharedPreferences preferences) {