diff --git a/app/lib/conversation_list/conversation_list_content.dart b/app/lib/conversation_list/conversation_list_content.dart
index 205e8403..b4d4d1eb 100644
--- a/app/lib/conversation_list/conversation_list_content.dart
+++ b/app/lib/conversation_list/conversation_list_content.dart
@@ -48,7 +48,6 @@ class _NoConversations extends StatelessWidget {
         'Create a new connection to get started',
         style: TextStyle(
           fontSize: isLargeScreen(context) ? 14 : 15,
-          fontWeight: FontWeight.normal,
           color: Colors.black54,
         ),
       ),
diff --git a/app/lib/conversation_list/create_conversation_view.dart b/app/lib/conversation_list/create_conversation_view.dart
index f941d779..d1fee01f 100644
--- a/app/lib/conversation_list/create_conversation_view.dart
+++ b/app/lib/conversation_list/create_conversation_view.dart
@@ -30,12 +30,10 @@ class _CreateConversationViewState extends State<CreateConversationView> {
     return AlertDialog(
       title: Text(widget.title),
       titlePadding: const EdgeInsets.all(20),
-      titleTextStyle: const TextStyle(
-        fontFamily: fontFamily,
-        fontWeight: FontWeight.bold,
-        fontSize: 20,
-        color: colorGreyDark,
-      ),
+      titleTextStyle: Theme.of(context)
+          .textTheme
+          .titleLarge
+          ?.copyWith(color: colorGreyDark),
       actionsAlignment: MainAxisAlignment.spaceBetween,
       actionsPadding: const EdgeInsets.all(20),
       buttonPadding: const EdgeInsets.symmetric(horizontal: 20, vertical: 20),
diff --git a/app/lib/developer/change_user_screen.dart b/app/lib/developer/change_user_screen.dart
index 5465b26e..cbb28129 100644
--- a/app/lib/developer/change_user_screen.dart
+++ b/app/lib/developer/change_user_screen.dart
@@ -118,7 +118,8 @@ class _ClientRecordsList extends StatelessWidget {
             titleTextStyle: Theme.of(context)
                 .textTheme
                 .bodyMedium
-                ?.copyWith(color: textColor, fontWeight: FontWeight.w600),
+                ?.copyWith(color: textColor)
+                .merge(VariableFontWeight.semiBold),
             subtitleTextStyle: Theme.of(context)
                 .textTheme
                 .bodySmall
diff --git a/app/lib/developer/developer_settings_screen.dart b/app/lib/developer/developer_settings_screen.dart
index 54518d01..21f488a2 100644
--- a/app/lib/developer/developer_settings_screen.dart
+++ b/app/lib/developer/developer_settings_screen.dart
@@ -237,7 +237,7 @@ class _SectionHeader extends StatelessWidget {
         style: Theme.of(context)
             .textTheme
             .labelMedium
-            ?.copyWith(fontWeight: FontWeight.bold),
+            ?.merge(VariableFontWeight.bold),
       ),
     );
   }
diff --git a/app/test/developer/goldens/change_user_screen.png b/app/test/developer/goldens/change_user_screen.png
index 6cbeb6b8..e524cb8f 100644
--- a/app/test/developer/goldens/change_user_screen.png
+++ b/app/test/developer/goldens/change_user_screen.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5beea959177d29cc7e9baf8e64ea2f5fca1f42abc2d963c23001181be5616a09
-size 143632
+oid sha256:8d164a7557abcc1fe55a28a7445926ef3e6d8c08f9fbc9774968866ceea228c8
+size 143679
diff --git a/app/test/developer/goldens/developer_settings_screen.png b/app/test/developer/goldens/developer_settings_screen.png
index ae0b5c73..faf10eea 100644
--- a/app/test/developer/goldens/developer_settings_screen.png
+++ b/app/test/developer/goldens/developer_settings_screen.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:206767654f329170c8ae74dd1920d30438f8b838dd370702a4617158f603ffad
-size 135673
+oid sha256:978269eaff237858471b853953f0b551c8e39ac974cc87034851b7a4e72412ee
+size 135152