diff --git a/lib/views/contactsview.dart b/lib/views/contactsview.dart
index 4687b0db..850d6a76 100644
--- a/lib/views/contactsview.dart
+++ b/lib/views/contactsview.dart
@@ -20,6 +20,7 @@ import '../config.dart';
 import '../main.dart';
 import '../models/message.dart';
 import '../settings.dart';
+import '../themes/opaque.dart';
 import 'addcontactview.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:qr_flutter/qr_flutter.dart';
@@ -183,21 +184,15 @@ class _ContactsViewState extends State<ContactsView> {
                   itemBuilder: (BuildContext context) => <PopupMenuEntry<ProfileStatusMenu>>[
                     PopupMenuItem<ProfileStatusMenu>(
                       value: ProfileStatusMenu.available,
-                      child: Text(
-                        AppLocalizations.of(context)!.availabilityStatusAvailable!,
-                      ),
+                      child: Text(AppLocalizations.of(context)!.availabilityStatusAvailable!, style: Provider.of<Settings>(context, listen: false).scaleFonts(defaultTextButtonStyle)),
                     ),
                     PopupMenuItem<ProfileStatusMenu>(
                       value: ProfileStatusMenu.away,
-                      child: Text(
-                        AppLocalizations.of(context)!.availabilityStatusAway!,
-                      ),
+                      child: Text(AppLocalizations.of(context)!.availabilityStatusAway!, style: Provider.of<Settings>(context, listen: false).scaleFonts(defaultTextButtonStyle)),
                     ),
                     PopupMenuItem<ProfileStatusMenu>(
                       value: ProfileStatusMenu.busy,
-                      child: Text(
-                        AppLocalizations.of(context)!.availabilityStatusBusy!,
-                      ),
+                      child: Text(AppLocalizations.of(context)!.availabilityStatusBusy!, style: Provider.of<Settings>(context, listen: false).scaleFonts(defaultTextButtonStyle)),
                     ),
                   ],
                 ),
diff --git a/lib/widgets/textfield.dart b/lib/widgets/textfield.dart
index 021f4bf8..95ec20c7 100644
--- a/lib/widgets/textfield.dart
+++ b/lib/widgets/textfield.dart
@@ -1,3 +1,4 @@
+import 'package:cwtch/themes/opaque.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
@@ -64,7 +65,7 @@ class _CwtchTextFieldState extends State<CwtchTextField> {
             scrollController: _scrollController,
             enableIMEPersonalizedLearning: false,
             focusNode: _focusNode,
-            style: TextStyle(overflow: TextOverflow.clip),
+            style: Provider.of<Settings>(context).scaleFonts(defaultTextStyle).copyWith(overflow: TextOverflow.clip),
             decoration: InputDecoration(
                 errorMaxLines: 2,
                 hintText: widget.hintText,