diff --git a/app/src/main/kotlin/com/simplemobiletools/calculator/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/calculator/activities/MainActivity.kt
index 43e667f9..f7744a96 100644
--- a/app/src/main/kotlin/com/simplemobiletools/calculator/activities/MainActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calculator/activities/MainActivity.kt
@@ -5,6 +5,7 @@ import android.content.Intent
 import android.os.Bundle
 import android.view.View
 import android.view.WindowManager
+import androidx.core.content.res.ResourcesCompat
 import com.simplemobiletools.calculator.BuildConfig
 import com.simplemobiletools.calculator.R
 import com.simplemobiletools.calculator.databases.CalculatorDatabase
@@ -93,10 +94,12 @@ class MainActivity : SimpleActivity(), Calculator {
         val properPrimaryColor = getProperPrimaryColor()
         arrayOf(btn_percent, btn_power, btn_root, btn_clear, btn_reset, btn_divide, btn_multiply, btn_plus, btn_minus, btn_equals, btn_decimal).forEach {
             it.setTextColor(properPrimaryColor)
+            it.background = ResourcesCompat.getDrawable(resources, R.drawable.button_circular_background, theme)
             it.background?.alpha = 200
         }
 
         arrayOf(btn_0, btn_1, btn_2, btn_3, btn_4, btn_5, btn_6, btn_7, btn_8, btn_9).forEach {
+            it.background = ResourcesCompat.getDrawable(resources, R.drawable.button_circular_background, theme)
             it.background?.alpha = 80
         }
     }
diff --git a/app/src/main/res/values-land/dimens.xml b/app/src/main/res/values-land/dimens.xml
new file mode 100644
index 00000000..90f246cb
--- /dev/null
+++ b/app/src/main/res/values-land/dimens.xml
@@ -0,0 +1,4 @@
+<resources>
+    <dimen name="button_text_size">22sp</dimen>
+    <dimen name="button_layout_margin">2dp</dimen>
+</resources>
diff --git a/app/src/main/res/values-sw600dp/dimens.xml b/app/src/main/res/values-sw600dp/dimens.xml
index 72deb09e..7342e6d0 100644
--- a/app/src/main/res/values-sw600dp/dimens.xml
+++ b/app/src/main/res/values-sw600dp/dimens.xml
@@ -1,6 +1,7 @@
 <resources>
     <dimen name="initial_widget_width">320dp</dimen>
     <dimen name="initial_widget_height">320dp</dimen>
+    <dimen name="button_layout_margin">@dimen/activity_margin</dimen>
 
     <dimen name="button_text_size">42sp</dimen>
     <dimen name="formula_text_size">30sp</dimen>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 55ba3f05..d81400a7 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -3,6 +3,7 @@
     <dimen name="initial_widget_height">250dp</dimen>
     <dimen name="min_widget_width">180dp</dimen>
     <dimen name="min_widget_height">180dp</dimen>
+    <dimen name="button_layout_margin">@dimen/medium_margin</dimen>
 
     <dimen name="button_text_size">34sp</dimen>
     <dimen name="formula_text_size">20sp</dimen>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 337a8533..efb2c444 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -2,13 +2,12 @@
 
     <style name="AppTheme" parent="AppTheme.Base" />
 
-    <style name="MyButton" parent="ShapeAppearanceOverlay.Material3.Button">
-        <item name="android:background">@drawable/button_circular_background</item>
+    <style name="MyButton">
         <item name="android:textSize">@dimen/button_text_size</item>
         <item name="android:fontFamily">sans-serif-light</item>
         <item name="android:textAllCaps">false</item>
         <item name="android:padding">0dp</item>
-        <item name="android:layout_margin">@dimen/medium_margin</item>
+        <item name="android:layout_margin">@dimen/button_layout_margin</item>
     </style>
 
 </resources>