diff --git a/lib/themes/opaque.dart b/lib/themes/opaque.dart
index 7fdaff31..ff1300eb 100644
--- a/lib/themes/opaque.dart
+++ b/lib/themes/opaque.dart
@@ -184,6 +184,7 @@ ThemeData mkThemeData(Settings opaque) {
                 ? opaque.current().defaultButtonDisabledColor
                 : null),
         enableFeedback: true,
+        textStyle: MaterialStateProperty.all(opaque.scaleFonts(defaultTextButtonStyle)),
         padding: MaterialStateProperty.all(EdgeInsets.all(20)),
         shape: MaterialStateProperty.all(RoundedRectangleBorder(
           borderRadius: BorderRadius.circular(6.0),
@@ -193,9 +194,12 @@ ThemeData mkThemeData(Settings opaque) {
 
     scrollbarTheme: ScrollbarThemeData(isAlwaysShown: false, thumbColor: MaterialStateProperty.all(opaque.current().scrollbarDefaultColor)),
     tabBarTheme: TabBarTheme(
-        labelColor: opaque.current().mainTextColor,
-        unselectedLabelColor: opaque.current().mainTextColor,
-        indicator: UnderlineTabIndicator(borderSide: BorderSide(color: opaque.current().defaultButtonActiveColor))),
+      labelColor: opaque.current().mainTextColor,
+      unselectedLabelColor: opaque.current().mainTextColor,
+      indicator: UnderlineTabIndicator(borderSide: BorderSide(color: opaque.current().defaultButtonActiveColor)),
+      labelStyle: opaque.scaleFonts(defaultTextButtonStyle),
+      unselectedLabelStyle: opaque.scaleFonts(defaultTextStyle),
+    ),
     dialogTheme: DialogTheme(
         backgroundColor: opaque.current().backgroundPaneColor,
         titleTextStyle: TextStyle(fontFamily: "Inter", fontWeight: FontWeight.bold, color: opaque.current().mainTextColor),
diff --git a/lib/views/globalsettingsview.dart b/lib/views/globalsettingsview.dart
index 6c9c8067..a213931a 100644
--- a/lib/views/globalsettingsview.dart
+++ b/lib/views/globalsettingsview.dart
@@ -129,9 +129,11 @@ class _GlobalSettingsViewState extends State<GlobalSettingsView> {
                                     return DropdownMenuItem<String>(
                                       value: value.toString(),
                                       child: Text(
-                                          key: Key("dropdownLanguage" + value.languageCode),
-                                          getLanguageFull(context, value.languageCode, value.countryCode),
-                                          style: settings.scaleFonts(defaultDropDownMenuItemTextStyle)),
+                                        key: Key("dropdownLanguage" + value.languageCode),
+                                        getLanguageFull(context, value.languageCode, value.countryCode),
+                                        style: settings.scaleFonts(defaultDropDownMenuItemTextStyle),
+                                        overflow: TextOverflow.ellipsis,
+                                      ),
                                     );
                                   }).toList()))),
                       SwitchListTile(
diff --git a/lib/views/groupsettingsview.dart b/lib/views/groupsettingsview.dart
index 492c0847..275b7636 100644
--- a/lib/views/groupsettingsview.dart
+++ b/lib/views/groupsettingsview.dart
@@ -2,6 +2,7 @@ import 'package:cwtch/cwtch_icons_icons.dart';
 import 'package:cwtch/models/appstate.dart';
 import 'package:cwtch/models/contact.dart';
 import 'package:cwtch/models/profile.dart';
+import 'package:cwtch/themes/opaque.dart';
 import 'package:flutter/services.dart';
 import 'package:cwtch/widgets/buttontextfield.dart';
 import 'package:cwtch/widgets/cwtchlabel.dart';
@@ -180,7 +181,7 @@ class _GroupSettingsViewState extends State<GroupSettingsView> {
                                     icon: Icon(CwtchIcons.leave_group),
                                     label: Text(
                                       AppLocalizations.of(context)!.leaveConversation,
-                                      style: TextStyle(decoration: TextDecoration.underline),
+                                      style: settings.scaleFonts(defaultTextButtonStyle.copyWith(decoration: TextDecoration.underline)),
                                     ),
                                   ))
                             ])