diff --git a/assets/google_fonts/Inter-Black.ttf b/assets/google_fonts/Inter-Black.ttf
deleted file mode 100644
index e284fa0052..0000000000
Binary files a/assets/google_fonts/Inter-Black.ttf and /dev/null differ
diff --git a/assets/google_fonts/Inter-ExtraBold.ttf b/assets/google_fonts/Inter-ExtraBold.ttf
deleted file mode 100644
index 2b55fc13fe..0000000000
Binary files a/assets/google_fonts/Inter-ExtraBold.ttf and /dev/null differ
diff --git a/assets/google_fonts/Inter-ExtraLight.ttf b/assets/google_fonts/Inter-ExtraLight.ttf
deleted file mode 100644
index af2bfbb327..0000000000
Binary files a/assets/google_fonts/Inter-ExtraLight.ttf and /dev/null differ
diff --git a/assets/google_fonts/Inter-Light.ttf b/assets/google_fonts/Inter-Light.ttf
deleted file mode 100644
index 34546cfd71..0000000000
Binary files a/assets/google_fonts/Inter-Light.ttf and /dev/null differ
diff --git a/assets/google_fonts/Inter-Thin.ttf b/assets/google_fonts/Inter-Thin.ttf
deleted file mode 100644
index 7f5b005a21..0000000000
Binary files a/assets/google_fonts/Inter-Thin.ttf and /dev/null differ
diff --git a/lib/config/themes.dart b/lib/config/themes.dart
index 22cd1a9668..bee1a5ef5f 100644
--- a/lib/config/themes.dart
+++ b/lib/config/themes.dart
@@ -3,7 +3,6 @@ import 'package:fluffychat/utils/responsive/responsive_utils.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:go_router/go_router.dart';
-import 'package:google_fonts/google_fonts.dart';
 import 'package:linagora_design_flutter/colors/linagora_ref_colors.dart';
 import 'package:linagora_design_flutter/colors/linagora_sys_colors.dart';
 
@@ -23,58 +22,72 @@ abstract class TwakeThemes {
 
   static ResponsiveUtils responsive = getIt.get<ResponsiveUtils>();
 
-  static var fallbackTextTheme = TextTheme(
-    bodyLarge: GoogleFonts.inter(
+  static var fallbackTextTheme = const TextTheme(
+    bodyLarge: TextStyle(
+      fontFamily: 'Inter',
       fontWeight: FontWeight.w500,
       letterSpacing: -0.15,
     ),
-    bodyMedium: GoogleFonts.inter(
+    bodyMedium: TextStyle(
+      fontFamily: 'Inter',
       fontWeight: FontWeight.w500,
       letterSpacing: 0.25,
     ),
-    bodySmall: GoogleFonts.inter(
+    bodySmall: TextStyle(
+      fontFamily: 'Inter',
       fontWeight: FontWeight.w500,
       letterSpacing: 0.4,
     ),
-    labelLarge: GoogleFonts.inter(
+    labelLarge: TextStyle(
+      fontFamily: 'Inter',
       fontWeight: FontWeight.w500,
       letterSpacing: 0.1,
     ),
-    labelSmall: GoogleFonts.inter(
+    labelSmall: TextStyle(
+      fontFamily: 'Inter',
       fontWeight: FontWeight.w500,
       letterSpacing: 0.5,
     ),
-    displayLarge: GoogleFonts.inter(
+    displayLarge: TextStyle(
+      fontFamily: 'Inter',
       fontWeight: FontWeight.w700,
     ),
-    displayMedium: GoogleFonts.inter(
+    displayMedium: TextStyle(
+      fontFamily: 'Inter',
       fontWeight: FontWeight.w600,
       letterSpacing: 0.4,
     ),
-    displaySmall: GoogleFonts.inter(
+    displaySmall: TextStyle(
+      fontFamily: 'Inter',
       fontWeight: FontWeight.w600,
       letterSpacing: 0.4,
     ),
-    headlineMedium: GoogleFonts.inter(
+    headlineMedium: TextStyle(
+      fontFamily: 'Inter',
       fontWeight: FontWeight.w600,
     ),
-    headlineSmall: GoogleFonts.inter(
+    headlineSmall: TextStyle(
+      fontFamily: 'Inter',
       fontWeight: FontWeight.w600,
       letterSpacing: 0.4,
     ),
-    headlineLarge: GoogleFonts.inter(
+    headlineLarge: TextStyle(
+      fontFamily: 'Inter',
       fontWeight: FontWeight.w600,
       fontSize: 32,
     ),
-    titleLarge: GoogleFonts.inter(
+    titleLarge: TextStyle(
+      fontFamily: 'Inter',
       fontWeight: FontWeight.w600,
       letterSpacing: -0.15,
     ),
-    titleMedium: GoogleFonts.inter(
+    titleMedium: TextStyle(
+      fontFamily: 'Inter',
       fontWeight: FontWeight.w500,
       letterSpacing: 0.15,
     ),
-    titleSmall: GoogleFonts.inter(
+    titleSmall: TextStyle(
+      fontFamily: 'Inter',
       fontWeight: FontWeight.w500,
       letterSpacing: 0.1,
     ),
diff --git a/lib/pages/bootstrap/bootstrap_dialog.dart b/lib/pages/bootstrap/bootstrap_dialog.dart
index 143897e1f4..a401f876c1 100644
--- a/lib/pages/bootstrap/bootstrap_dialog.dart
+++ b/lib/pages/bootstrap/bootstrap_dialog.dart
@@ -10,7 +10,6 @@ import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/l10n.dart';
 import 'package:flutter_secure_storage/flutter_secure_storage.dart';
 
-import 'package:google_fonts/google_fonts.dart';
 import 'package:matrix/encryption.dart';
 import 'package:matrix/encryption/utils/bootstrap.dart';
 import 'package:matrix/matrix.dart';
@@ -136,7 +135,7 @@ class BootstrapDialogState extends State<BootstrapDialog> {
                   minLines: 2,
                   maxLines: 4,
                   readOnly: true,
-                  style: GoogleFonts.robotoMono(),
+                  style: Theme.of(context).textTheme.bodyMedium,
                   contextMenuBuilder: mobileTwakeContextMenuBuilder,
                   controller: TextEditingController(text: key),
                   decoration: const InputDecoration(
@@ -268,12 +267,11 @@ class BootstrapDialogState extends State<BootstrapDialog> {
                           ? null
                           : [AutofillHints.password],
                       controller: _recoveryKeyTextEditingController,
-                      style: GoogleFonts.robotoMono(),
+                      style: Theme.of(context).textTheme.bodyLarge,
                       decoration: InputDecoration(
                         contentPadding: const EdgeInsets.all(16),
-                        hintStyle: TextStyle(
-                          fontFamily:
-                              Theme.of(context).textTheme.bodyLarge?.fontFamily,
+                        hintStyle: const TextStyle(
+                          fontFamily: 'Inter',
                         ),
                         hintText: L10n.of(context)!.recoveryKey,
                         errorText: _recoveryKeyInputError,
diff --git a/lib/pages/chat/chat_app_bar_title_style.dart b/lib/pages/chat/chat_app_bar_title_style.dart
index 2269ce0ea8..fe80764a37 100644
--- a/lib/pages/chat/chat_app_bar_title_style.dart
+++ b/lib/pages/chat/chat_app_bar_title_style.dart
@@ -1,7 +1,6 @@
 import 'package:fluffychat/di/global/get_it_initializer.dart';
 import 'package:fluffychat/utils/responsive/responsive_utils.dart';
 import 'package:flutter/material.dart';
-import 'package:google_fonts/google_fonts.dart';
 import 'package:linagora_design_flutter/linagora_design_flutter.dart';
 
 class ChatAppBarTitleStyle {
@@ -37,12 +36,12 @@ class ChatAppBarTitleStyle {
           ? Theme.of(context).textTheme.labelMedium?.copyWith(
                 color: LinagoraRefColors.material().tertiary[30],
                 letterSpacing: ChatAppBarTitleStyle.letterSpacingStatusContent,
-                fontFamily: GoogleFonts.inter().fontFamily,
+                fontFamily: 'Inter',
               )
           : Theme.of(context).textTheme.bodySmall?.copyWith(
                 color: LinagoraRefColors.material().neutral[50],
                 letterSpacing: ChatAppBarTitleStyle.letterSpacingRoomName,
-                fontFamily: GoogleFonts.inter().fontFamily,
+                fontFamily: 'Inter',
               );
 
   static TextStyle? onlineStatusTextStyle(BuildContext context) =>
diff --git a/lib/pages/chat/chat_input_row.dart b/lib/pages/chat/chat_input_row.dart
index 3ef22295f6..21de45fbdc 100644
--- a/lib/pages/chat/chat_input_row.dart
+++ b/lib/pages/chat/chat_input_row.dart
@@ -12,7 +12,6 @@ import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/l10n.dart';
 import 'package:flutter_keyboard_visibility/flutter_keyboard_visibility.dart';
 import 'package:flutter_svg/flutter_svg.dart';
-import 'package:google_fonts/google_fonts.dart';
 import 'package:linagora_design_flutter/colors/linagora_ref_colors.dart';
 import 'package:matrix/matrix.dart';
 
@@ -157,7 +156,7 @@ class ChatInputRow extends StatelessWidget {
               color: controller.responsive.isMobile(context)
                   ? LinagoraRefColors.material().tertiary[50]
                   : LinagoraRefColors.material().tertiary[30],
-              fontFamily: GoogleFonts.inter().fontFamily,
+              fontFamily: 'Inter',
             ),
       ),
       onChanged: controller.onInputBarChanged,
diff --git a/lib/pages/chat/events/message/display_name_widget.dart b/lib/pages/chat/events/message/display_name_widget.dart
index 21ad559d8c..37436ca501 100644
--- a/lib/pages/chat/events/message/display_name_widget.dart
+++ b/lib/pages/chat/events/message/display_name_widget.dart
@@ -1,7 +1,6 @@
 import 'package:fluffychat/pages/chat/events/message/message_style.dart';
 import 'package:fluffychat/utils/string_extension.dart';
 import 'package:flutter/material.dart';
-import 'package:google_fonts/google_fonts.dart';
 import 'package:linagora_design_flutter/linagora_design_flutter.dart';
 import 'package:matrix/matrix.dart';
 
@@ -29,7 +28,7 @@ class DisplayNameWidget extends StatelessWidget {
               maxCharacters: maxCharactersDisplayNameBubble,
             ),
             style: Theme.of(context).textTheme.labelMedium?.copyWith(
-                  fontFamily: GoogleFonts.inter().fontFamily,
+                  fontFamily: 'Inter',
                   color: LinagoraSysColors.material().secondary,
                 ),
             maxLines: 2,
diff --git a/lib/pages/chat/input_bar/input_bar_style.dart b/lib/pages/chat/input_bar/input_bar_style.dart
index cb05cf8131..3cb1c7c53b 100644
--- a/lib/pages/chat/input_bar/input_bar_style.dart
+++ b/lib/pages/chat/input_bar/input_bar_style.dart
@@ -1,5 +1,4 @@
 import 'package:flutter/material.dart';
-import 'package:google_fonts/google_fonts.dart';
 
 class InputBarStyle {
   static const double suggestionAvatarSize = 30;
@@ -17,7 +16,7 @@ class InputBarStyle {
             color: Theme.of(context).brightness == Brightness.light
                 ? Colors.black
                 : Colors.white,
-            fontFamily: GoogleFonts.inter().fontFamily,
+            fontFamily: 'Inter',
           );
 
   static const double suggestionTileAvatarTextGap = 8.0;
diff --git a/lib/pages/chat_draft/draft_chat_view_style.dart b/lib/pages/chat_draft/draft_chat_view_style.dart
index 8f5e60c080..18f619f95e 100644
--- a/lib/pages/chat_draft/draft_chat_view_style.dart
+++ b/lib/pages/chat_draft/draft_chat_view_style.dart
@@ -4,7 +4,6 @@ import 'package:fluffychat/pages/chat/chat_input_row_style.dart';
 import 'package:fluffychat/utils/responsive/responsive_utils.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/l10n.dart';
-import 'package:google_fonts/google_fonts.dart';
 import 'package:linagora_design_flutter/linagora_design_flutter.dart';
 
 class DraftChatViewStyle {
@@ -27,7 +26,7 @@ class DraftChatViewStyle {
               color: responsive.isMobile(context)
                   ? LinagoraRefColors.material().tertiary[50]
                   : LinagoraRefColors.material().tertiary[30],
-              fontFamily: GoogleFonts.inter().fontFamily,
+              fontFamily: 'Inter',
             ),
       );
 
diff --git a/lib/pages/chat_encryption_settings/chat_encryption_settings_view.dart b/lib/pages/chat_encryption_settings/chat_encryption_settings_view.dart
index fe1b04aa2f..26305f0cf9 100644
--- a/lib/pages/chat_encryption_settings/chat_encryption_settings_view.dart
+++ b/lib/pages/chat_encryption_settings/chat_encryption_settings_view.dart
@@ -2,7 +2,6 @@ import 'package:fluffychat/utils/url_launcher.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/l10n.dart';
 import 'package:go_router/go_router.dart';
-import 'package:google_fonts/google_fonts.dart';
 import 'package:matrix/matrix.dart';
 import 'package:fluffychat/config/app_config.dart';
 import 'package:fluffychat/pages/chat_encryption_settings/chat_encryption_settings.dart';
@@ -168,7 +167,7 @@ class ChatEncryptionSettingsView extends StatelessWidget {
                           deviceKeys[i].ed25519Key?.beautified ??
                               L10n.of(context)!.unknownEncryptionAlgorithm,
                           style: TextStyle(
-                            fontFamily: GoogleFonts.robotoMono().fontFamily,
+                            fontFamily: 'Inter',
                             color: Theme.of(context).colorScheme.secondary,
                           ),
                         ),
diff --git a/lib/pages/chat_list/chat_list_item_title.dart b/lib/pages/chat_list/chat_list_item_title.dart
index 0ade848ed1..59bc87b477 100644
--- a/lib/pages/chat_list/chat_list_item_title.dart
+++ b/lib/pages/chat_list/chat_list_item_title.dart
@@ -9,7 +9,6 @@ import 'package:fluffychat/utils/room_status_extension.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/l10n.dart';
 import 'package:flutter_svg/flutter_svg.dart';
-import 'package:google_fonts/google_fonts.dart';
 import 'package:linagora_design_flutter/linagora_design_flutter.dart';
 import 'package:matrix/matrix.dart';
 
@@ -46,7 +45,7 @@ class ChatListItemTitle extends StatelessWidget with ChatListItemMixin {
                         maxLines: 1,
                         softWrap: false,
                         style: ListItemStyle.titleTextStyle(
-                          fontFamily: GoogleFonts.inter().fontFamily ?? 'Inter',
+                          fontFamily: 'Inter',
                         ),
                       ),
                     ),
diff --git a/lib/pages/new_private_chat/widget/expansion_contact_list_tile.dart b/lib/pages/new_private_chat/widget/expansion_contact_list_tile.dart
index bedf219141..da0ed42a82 100644
--- a/lib/pages/new_private_chat/widget/expansion_contact_list_tile.dart
+++ b/lib/pages/new_private_chat/widget/expansion_contact_list_tile.dart
@@ -7,7 +7,6 @@ import 'package:fluffychat/widgets/highlight_text.dart';
 import 'package:fluffychat/widgets/matrix.dart';
 import 'package:fluffychat/widgets/twake_components/twake_chip.dart';
 import 'package:flutter/material.dart';
-import 'package:google_fonts/google_fonts.dart';
 import 'package:flutter_gen/gen_l10n/l10n.dart';
 import 'package:fluffychat/utils/string_extension.dart';
 import 'package:linagora_design_flutter/linagora_design_flutter.dart';
@@ -70,9 +69,7 @@ class ExpansionContactListTile extends StatelessWidget {
                                       contactDisplayName: contact.displayName,
                                       highlightKeyword: highlightKeyword,
                                       style: ListItemStyle.titleTextStyle(
-                                        fontFamily:
-                                            GoogleFonts.inter().fontFamily ??
-                                                'Inter',
+                                        fontFamily: 'Inter',
                                       ),
                                     ),
                                   ),
@@ -105,8 +102,7 @@ class ExpansionContactListTile extends StatelessWidget {
                           text: contact.matrixId!,
                           searchWord: highlightKeyword,
                           style: ListItemStyle.subtitleTextStyle(
-                            fontFamily:
-                                GoogleFonts.inter().fontFamily ?? 'Inter',
+                            fontFamily: 'Inter',
                           ),
                           maxLines: 1,
                           overflow: TextOverflow.ellipsis,
@@ -116,8 +112,7 @@ class ExpansionContactListTile extends StatelessWidget {
                           text: contact.email!,
                           searchWord: highlightKeyword,
                           style: ListItemStyle.subtitleTextStyle(
-                            fontFamily:
-                                GoogleFonts.inter().fontFamily ?? 'Inter',
+                            fontFamily: 'Inter',
                           ),
                           maxLines: 1,
                           overflow: TextOverflow.ellipsis,
@@ -127,8 +122,7 @@ class ExpansionContactListTile extends StatelessWidget {
                           text: contact.phoneNumber!,
                           searchWord: highlightKeyword,
                           style: ListItemStyle.subtitleTextStyle(
-                            fontFamily:
-                                GoogleFonts.inter().fontFamily ?? 'Inter',
+                            fontFamily: 'Inter',
                           ),
                         ),
                     ],
diff --git a/lib/pages/search/recent_item_widget.dart b/lib/pages/search/recent_item_widget.dart
index ee918d214e..5af17917b7 100644
--- a/lib/pages/search/recent_item_widget.dart
+++ b/lib/pages/search/recent_item_widget.dart
@@ -8,7 +8,6 @@ import 'package:fluffychat/widgets/highlight_text.dart';
 import 'package:fluffychat/widgets/twake_components/twake_chip.dart';
 import 'package:flutter/material.dart' hide SearchController;
 import 'package:flutter_gen/gen_l10n/l10n.dart';
-import 'package:google_fonts/google_fonts.dart';
 import 'package:linagora_design_flutter/linagora_design_flutter.dart';
 import 'package:matrix/matrix.dart';
 
@@ -114,7 +113,7 @@ class _GroupChatInformation extends StatelessWidget {
               _SearchHighlightText(
                 text: recentChatPresentationSearch.displayName ?? "",
                 style: ListItemStyle.titleTextStyle(
-                  fontFamily: GoogleFonts.inter().fontFamily ?? 'Inter',
+                  fontFamily: 'Inter',
                 ),
                 searchWord: searchKeyword,
               ),
@@ -124,7 +123,7 @@ class _GroupChatInformation extends StatelessWidget {
                 maxLines: 1,
                 softWrap: false,
                 style: ListItemStyle.subtitleTextStyle(
-                  fontFamily: GoogleFonts.inter().fontFamily ?? 'Inter',
+                  fontFamily: 'Inter',
                 ),
               ),
             ],
@@ -192,14 +191,14 @@ class _DirectChatInformation extends StatelessWidget {
               _SearchHighlightText(
                 text: recentChatPresentationSearch.displayName ?? "",
                 style: ListItemStyle.titleTextStyle(
-                  fontFamily: GoogleFonts.inter().fontFamily ?? 'Inter',
+                  fontFamily: 'Inter',
                 ),
                 searchWord: searchKeyword,
               ),
               _SearchHighlightText(
                 text: recentChatPresentationSearch.directChatMatrixID ?? "",
                 style: ListItemStyle.subtitleTextStyle(
-                  fontFamily: GoogleFonts.inter().fontFamily ?? 'Inter',
+                  fontFamily: 'Inter',
                 ),
                 searchWord: searchKeyword,
               ),
@@ -250,7 +249,7 @@ class _ContactInformation extends StatelessWidget {
                     child: _SearchHighlightText(
                       text: contactPresentationSearch.displayName ?? "",
                       style: ListItemStyle.titleTextStyle(
-                        fontFamily: GoogleFonts.inter().fontFamily ?? 'Inter',
+                        fontFamily: 'Inter',
                       ),
                       searchWord: searchKeyword,
                     ),
@@ -273,7 +272,7 @@ class _ContactInformation extends StatelessWidget {
                     _SearchHighlightText(
                       text: contactPresentationSearch.matrixId ?? "",
                       style: ListItemStyle.subtitleTextStyle(
-                        fontFamily: GoogleFonts.inter().fontFamily ?? 'Inter',
+                        fontFamily: 'Inter',
                       ),
                       searchWord: searchKeyword,
                     ),
@@ -281,7 +280,7 @@ class _ContactInformation extends StatelessWidget {
                     _SearchHighlightText(
                       text: contactPresentationSearch.email ?? "",
                       style: ListItemStyle.subtitleTextStyle(
-                        fontFamily: GoogleFonts.inter().fontFamily ?? 'Inter',
+                        fontFamily: 'Inter',
                       ),
                       searchWord: searchKeyword,
                     ),
diff --git a/lib/pages/settings_dashboard/settings/settings_item_builder.dart b/lib/pages/settings_dashboard/settings/settings_item_builder.dart
index 01a675e228..e06202c343 100644
--- a/lib/pages/settings_dashboard/settings/settings_item_builder.dart
+++ b/lib/pages/settings_dashboard/settings/settings_item_builder.dart
@@ -1,6 +1,5 @@
 import 'package:fluffychat/pages/settings_dashboard/settings/settings_view_style.dart';
 import 'package:flutter/material.dart';
-import 'package:google_fonts/google_fonts.dart';
 import 'package:linagora_design_flutter/linagora_design_flutter.dart';
 
 class SettingsItemBuilder extends StatelessWidget {
@@ -53,8 +52,7 @@ class SettingsItemBuilder extends StatelessWidget {
                           Text(
                             title,
                             style: ListItemStyle.titleTextStyle(
-                              fontFamily:
-                                  GoogleFonts.inter().fontFamily ?? 'Inter',
+                              fontFamily: 'Inter',
                             ),
                             maxLines: 2,
                             overflow: TextOverflow.ellipsis,
diff --git a/lib/pages/settings_dashboard/settings_notifications/settings_notifications_view.dart b/lib/pages/settings_dashboard/settings_notifications/settings_notifications_view.dart
index 50b9d48011..22351e6001 100644
--- a/lib/pages/settings_dashboard/settings_notifications/settings_notifications_view.dart
+++ b/lib/pages/settings_dashboard/settings_notifications/settings_notifications_view.dart
@@ -8,7 +8,6 @@ import 'package:fluffychat/widgets/matrix.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/l10n.dart';
 import 'package:go_router/go_router.dart';
-import 'package:google_fonts/google_fonts.dart';
 import 'package:linagora_design_flutter/linagora_design_flutter.dart';
 import 'package:matrix/matrix.dart';
 import 'package:fluffychat/widgets/layouts/max_width_body.dart';
@@ -74,7 +73,7 @@ class SettingsNotificationsView extends StatelessWidget {
                     title: Text(
                       L10n.of(context)!.pushRules,
                       style: ListItemStyle.titleTextStyle(
-                        fontFamily: GoogleFonts.inter().fontFamily ?? 'Inter',
+                        fontFamily: 'Inter',
                       ),
                     ),
                   ),
@@ -91,7 +90,7 @@ class SettingsNotificationsView extends StatelessWidget {
                   title: Text(
                     L10n.of(context)!.devices,
                     style: ListItemStyle.titleTextStyle(
-                      fontFamily: GoogleFonts.inter().fontFamily ?? 'Inter',
+                      fontFamily: 'Inter',
                     ),
                   ),
                 ),
diff --git a/lib/presentation/decorators/chat_list/subtitle_text_style_decorator/subtitle_text_style_decorator.dart b/lib/presentation/decorators/chat_list/subtitle_text_style_decorator/subtitle_text_style_decorator.dart
index 7e1d03c7b0..3e7378114d 100644
--- a/lib/presentation/decorators/chat_list/subtitle_text_style_decorator/subtitle_text_style_decorator.dart
+++ b/lib/presentation/decorators/chat_list/subtitle_text_style_decorator/subtitle_text_style_decorator.dart
@@ -1,7 +1,6 @@
 import 'package:fluffychat/domain/model/room/room_extension.dart';
 import 'package:fluffychat/presentation/decorators/chat_list/subtitle_text_style_decorator/subtitle_text_style_component.dart';
 import 'package:flutter/material.dart';
-import 'package:google_fonts/google_fonts.dart';
 import 'package:linagora_design_flutter/linagora_design_flutter.dart';
 import 'package:matrix/matrix.dart';
 
@@ -33,7 +32,7 @@ class ReadChatListSubtitleTextStyleDecorator
   TextStyle textStyle(Room room, BuildContext context) {
     return Theme.of(context).textTheme.bodyMedium!.copyWith(
           color: LinagoraSysColors.material().onSurface,
-          fontFamily: GoogleFonts.inter().fontFamily,
+          fontFamily: 'Inter',
         );
   }
 }
diff --git a/lib/presentation/decorators/chat_list/title_text_style_decorator/title_text_style_decorator.dart b/lib/presentation/decorators/chat_list/title_text_style_decorator/title_text_style_decorator.dart
index 15435932f2..9af816e27b 100644
--- a/lib/presentation/decorators/chat_list/title_text_style_decorator/title_text_style_decorator.dart
+++ b/lib/presentation/decorators/chat_list/title_text_style_decorator/title_text_style_decorator.dart
@@ -1,6 +1,5 @@
 import 'package:fluffychat/presentation/decorators/chat_list/title_text_style_decorator/title_text_style_component.dart';
 import 'package:flutter/material.dart';
-import 'package:google_fonts/google_fonts.dart';
 import 'package:linagora_design_flutter/linagora_design_flutter.dart';
 import 'package:matrix/matrix.dart';
 
@@ -32,7 +31,6 @@ class ReadChatListTitleTextStyleDecorator
   TextStyle textStyle(Room room) {
     return LinagoraTextStyle.material().bodyMedium2.copyWith(
           color: LinagoraSysColors.material().onSurface,
-          fontFamily: GoogleFonts.inter().fontFamily,
         );
   }
 }
@@ -49,7 +47,6 @@ class UnreadChatListTitleTextStyleDecorator
       return _interfaceTextStyleComponent.textStyle(room).merge(
             LinagoraTextStyle.material().bodyMedium2.copyWith(
                   color: LinagoraSysColors.material().onSurface,
-                  fontFamily: GoogleFonts.inter().fontFamily,
                 ),
           );
     } else {
diff --git a/lib/presentation/mixins/chat_list_item_mixin.dart b/lib/presentation/mixins/chat_list_item_mixin.dart
index ee65ee081a..4c8606f35e 100644
--- a/lib/presentation/mixins/chat_list_item_mixin.dart
+++ b/lib/presentation/mixins/chat_list_item_mixin.dart
@@ -6,7 +6,6 @@ import 'package:fluffychat/utils/matrix_sdk_extensions/matrix_locals.dart';
 import 'package:fluffychat/widgets/mxc_image.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/l10n.dart';
-import 'package:google_fonts/google_fonts.dart';
 import 'package:linagora_design_flutter/linagora_design_flutter.dart';
 import 'package:matrix/matrix.dart';
 
@@ -44,7 +43,7 @@ mixin ChatListItemMixin {
           maxLines: isGroup ? 1 : 2,
           overflow: TextOverflow.ellipsis,
           style: ListItemStyle.subtitleTextStyle(
-            fontFamily: GoogleFonts.inter().fontFamily ?? 'Inter',
+            fontFamily: 'Inter',
           ),
         );
       },
@@ -56,7 +55,7 @@ mixin ChatListItemMixin {
     return Text(
       displayedTypingText,
       style: ListItemStyle.subtitleTextStyle(
-        fontFamily: GoogleFonts.inter().fontFamily ?? 'Inter',
+        fontFamily: 'Inter',
       ),
       maxLines: 2,
       softWrap: true,
@@ -138,7 +137,7 @@ mixin ChatListItemMixin {
               maxLines: 1,
               softWrap: false,
               style: ListItemStyle.subtitleTextStyle(
-                fontFamily: GoogleFonts.inter().fontFamily ?? 'Inter',
+                fontFamily: 'Inter',
               ).copyWith(
                 color: LinagoraSysColors.material().onSurface,
               ),
@@ -155,7 +154,7 @@ mixin ChatListItemMixin {
                     maxLines: 1,
                     overflow: TextOverflow.ellipsis,
                     style: ListItemStyle.subtitleTextStyle(
-                      fontFamily: GoogleFonts.inter().fontFamily ?? 'Inter',
+                      fontFamily: 'Inter',
                     ),
                   ),
           ],
@@ -201,7 +200,7 @@ mixin ChatListItemMixin {
                 ? L10n.of(context)!.photo
                 : L10n.of(context)!.video,
             style: ListItemStyle.subtitleTextStyle(
-              fontFamily: GoogleFonts.inter().fontFamily ?? 'Inter',
+              fontFamily: 'Inter',
             ),
           ),
         ),
diff --git a/pubspec.lock b/pubspec.lock
index 13640d3026..4bfdc1bade 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -1414,14 +1414,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "14.1.2"
-  google_fonts:
-    dependency: "direct main"
-    description:
-      name: google_fonts
-      sha256: "6b6f10f0ce3c42f6552d1c70d2c28d764cf22bb487f50f66cca31dcd5194f4d6"
-      url: "https://pub.dev"
-    source: hosted
-    version: "4.0.4"
   gradient_borders:
     dependency: transitive
     description:
diff --git a/pubspec.yaml b/pubspec.yaml
index 460e830be2..e7c4c1fd31 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -197,7 +197,6 @@ dependencies:
   video_player: ^2.7.2
   js: ^0.6.7
   super_clipboard: 0.8.15
-  google_fonts: ^4.0.4
   crypto: ^3.0.3
   flutter_contacts: ^1.1.7+1
   flutter_localized_locales: ^2.0.5
@@ -257,6 +256,17 @@ flutter:
     - assets/google_fonts/
     - configurations/
     - configurations/icons/
+  fonts:
+    - family: Inter
+      fonts:
+        - asset: assets/google_fonts/Inter-Medium.ttf
+          weight: 500
+        - asset: assets/google_fonts/Inter-Regular.ttf
+          weight: 400
+        - asset: assets/google_fonts/Inter-SemiBold.ttf
+          weight: 600
+        - asset: assets/google_fonts/Inter-Bold.ttf
+          weight: 700
 
 msix_config:
   display_name: Twake Chat