diff --git a/android-app/src/main/java/org/solovyev/android/calculator/CalculatorButtons.java b/android-app/src/main/java/org/solovyev/android/calculator/CalculatorButtons.java
index 08fdb7b0..2b10327e 100644
--- a/android-app/src/main/java/org/solovyev/android/calculator/CalculatorButtons.java
+++ b/android-app/src/main/java/org/solovyev/android/calculator/CalculatorButtons.java
@@ -64,12 +64,12 @@ public final class CalculatorButtons {
 										  @Nonnull View root) {
 		if (!layout.isOptimized()) {
 
-			final float textSize = root.getContext().getResources().getDimension(R.dimen.cpp_keyboard_button_text_size_mobile);
+			final float textSize = root.getContext().getResources().getDimensionPixelSize(R.dimen.cpp_keyboard_button_text_size_mobile);
 
 			Views.processViewsOfType(root, DragButton.class, new Views.ViewProcessor<DragButton>() {
 				@Override
 				public void process(@Nonnull DragButton button) {
-					button.setTextSize(TypedValue.COMPLEX_UNIT_DIP, textSize);
+					button.setTextSize(TypedValue.COMPLEX_UNIT_PX, textSize);
 				}
 			});
 		}
diff --git a/android-app/src/main/res/values-large-xhdpi/dimens.xml b/android-app/src/main/res/values-large-xhdpi/dimens.xml
new file mode 100644
index 00000000..75ce2f3b
--- /dev/null
+++ b/android-app/src/main/res/values-large-xhdpi/dimens.xml
@@ -0,0 +1,26 @@
+<!--
+  ~ Copyright 2013 serso aka se.solovyev
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~    http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  ~
+  ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ Contact details
+  ~
+  ~ Email: se.solovyev@gmail.com
+  ~ Site:  http://se.solovyev.org
+  -->
+
+<resources>
+	<dimen name="cpp_keyboard_button_text_size">30dp</dimen>
+	<dimen name="cpp_keyboard_button_text_size_mobile">40dp</dimen>
+</resources>
\ No newline at end of file