diff --git a/res/values-small/dimens.xml b/res/values-small/dimens.xml
index 9c568f0b82..4775251f06 100644
--- a/res/values-small/dimens.xml
+++ b/res/values-small/dimens.xml
@@ -1,5 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+
+    <!-- Session -->
+
+    <!-- Font Sizes -->
+    <dimen name="very_small_font_size">10sp</dimen>
+    <dimen name="small_font_size">13sp</dimen>
+    <dimen name="medium_font_size">15sp</dimen>
+    <dimen name="large_font_size">20sp</dimen>
+    <dimen name="very_large_font_size">25sp</dimen>
+    <dimen name="massive_font_size">50sp</dimen>
+
+    <!-- Session -->
+
     <dimen name="onboarding_title_size">32sp</dimen>
     <dimen name="onboarding_subtitle_size">18sp</dimen>
 </resources>
\ No newline at end of file
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 3ceaa3aefd..3ed8a9a187 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -4,11 +4,11 @@
     <!-- Session -->
 
     <!-- Font Sizes -->
-    <dimen name="very_small_font_size">10sp</dimen>
-    <dimen name="small_font_size">13sp</dimen>
-    <dimen name="medium_font_size">15sp</dimen>
-    <dimen name="large_font_size">20sp</dimen>
-    <dimen name="very_large_font_size">25sp</dimen>
+    <dimen name="very_small_font_size">12sp</dimen>
+    <dimen name="small_font_size">15sp</dimen>
+    <dimen name="medium_font_size">17sp</dimen>
+    <dimen name="large_font_size">22sp</dimen>
+    <dimen name="very_large_font_size">27sp</dimen>
     <dimen name="massive_font_size">50sp</dimen>
 
     <!-- Element Sizes -->
diff --git a/src/org/thoughtcrime/securesms/BaseActionBarActivity.java b/src/org/thoughtcrime/securesms/BaseActionBarActivity.java
index f849a90544..b0af5f1144 100644
--- a/src/org/thoughtcrime/securesms/BaseActionBarActivity.java
+++ b/src/org/thoughtcrime/securesms/BaseActionBarActivity.java
@@ -28,6 +28,7 @@ import org.thoughtcrime.securesms.util.dynamiclanguage.DynamicLanguageActivityHe
 import org.thoughtcrime.securesms.util.dynamiclanguage.DynamicLanguageContextWrapper;
 
 import java.lang.reflect.Field;
+import java.util.Date;
 
 import network.loki.messenger.R;
 
@@ -35,6 +36,7 @@ import network.loki.messenger.R;
 public abstract class BaseActionBarActivity extends AppCompatActivity {
   private static final String TAG = BaseActionBarActivity.class.getSimpleName();
   private BroadcastReceiver broadcastReceiver;
+  private Date lastUnexpectedDeviceLinkRequestDate;
 
   @Override
   protected void onCreate(Bundle savedInstanceState) {
@@ -57,6 +59,11 @@ public abstract class BaseActionBarActivity extends AppCompatActivity {
 
       @Override
       public void onReceive(Context context, Intent intent) {
+        Date now = new Date();
+        if (lastUnexpectedDeviceLinkRequestDate != null) {
+          if (now.getTime() - lastUnexpectedDeviceLinkRequestDate.getTime() < 30 * 1000) { return; }
+        }
+        lastUnexpectedDeviceLinkRequestDate = now;
         Toast.makeText(BaseActionBarActivity.this, "Open the device link screen by going to \"Settings\"> \"Devices\" > \"Link a Device\" to link your devices.", Toast.LENGTH_LONG).show();
       }
     };