diff --git a/app/src/main/java/org/apphatchery/gatbreferenceguide/app/App.kt b/app/src/main/java/org/apphatchery/gatbreferenceguide/app/App.kt
index bc0bc85..83a0f72 100644
--- a/app/src/main/java/org/apphatchery/gatbreferenceguide/app/App.kt
+++ b/app/src/main/java/org/apphatchery/gatbreferenceguide/app/App.kt
@@ -1,6 +1,8 @@
 package org.apphatchery.gatbreferenceguide.app
 
 import android.app.Application
+import android.content.Context
+import android.content.res.Configuration
 import androidx.appcompat.app.AppCompatDelegate
 import androidx.preference.PreferenceManager
 import com.google.firebase.FirebaseApp
@@ -11,6 +13,12 @@ import sdk.pendo.io.Pendo
 @HiltAndroidApp
 class App : Application() {
 
+    override fun attachBaseContext(base: Context) {
+        val configuration = Configuration(base.resources.configuration)
+        configuration.fontScale = 1.0f
+        super.attachBaseContext(base.createConfigurationContext(configuration))
+    }
+
     override fun onCreate() {
         super.onCreate()
         
diff --git a/app/src/main/java/org/apphatchery/gatbreferenceguide/ui/MainActivity.kt b/app/src/main/java/org/apphatchery/gatbreferenceguide/ui/MainActivity.kt
index a7289e5..1637ffc 100644
--- a/app/src/main/java/org/apphatchery/gatbreferenceguide/ui/MainActivity.kt
+++ b/app/src/main/java/org/apphatchery/gatbreferenceguide/ui/MainActivity.kt
@@ -1,7 +1,9 @@
 package org.apphatchery.gatbreferenceguide.ui
 
+import android.content.Context
 import android.content.SharedPreferences
 import android.content.pm.ActivityInfo
+import android.content.res.Configuration
 import android.os.Bundle
 import android.util.Log
 import android.view.View
@@ -57,6 +59,12 @@ class MainActivity : AppCompatActivity(), ActionBarController {
     // Search view properties - will be initialized when needed
     private var searchViewContainer: View? = null
 
+    override fun attachBaseContext(newBase: Context) {
+        val configuration = Configuration(newBase.resources.configuration)
+        configuration.fontScale = 1.0f
+        super.attachBaseContext(newBase.createConfigurationContext(configuration))
+    }
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         binding = ActivityMainBinding.inflate(layoutInflater)
diff --git a/app/src/main/res/layout/dialog_bookmark_success.xml b/app/src/main/res/layout/dialog_bookmark_success.xml
index 8eea624..f397623 100644
--- a/app/src/main/res/layout/dialog_bookmark_success.xml
+++ b/app/src/main/res/layout/dialog_bookmark_success.xml
@@ -6,25 +6,17 @@
     android:layout_gravity="center"
     android:background="@drawable/bookmark_popup_background">
 
-    <ScrollView
+    <TextView
+        android:id="@+id/bookmarked_text"
         android:layout_width="219dp"
         android:layout_height="82dp"
         android:layout_centerHorizontal="true"
         android:layout_alignParentTop="true"
         android:layout_marginTop="35dp"
-        android:fillViewport="true"
-        android:scrollbars="vertical">
-
-        <TextView
-            android:id="@+id/bookmarked_text"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:minHeight="82dp"
-            android:text="@string/bookmarked_message"
-            android:textAppearance="@style/BookmarkedTextStyle"
-            android:textColor="?attr/colorTextBlackWhite" />
-
-    </ScrollView>
+        android:text="@string/bookmarked_message"
+        android:textAppearance="@style/BookmarkedTextStyle"
+        android:textColor="?attr/colorTextBlackWhite"
+        android:autoSizeTextType="none" />
 
     <androidx.appcompat.widget.AppCompatButton
         android:id="@+id/visit_button"