diff --git a/lib/ui/pages/providers/providers.dart b/lib/ui/pages/providers/providers.dart
index 554c594b..ec397805 100644
--- a/lib/ui/pages/providers/providers.dart
+++ b/lib/ui/pages/providers/providers.dart
@@ -1,6 +1,7 @@
 import 'package:auto_route/auto_route.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
+import 'package:gap/gap.dart';
 import 'package:selfprivacy/config/brand_theme.dart';
 import 'package:selfprivacy/logic/bloc/backups/backups_bloc.dart';
 import 'package:selfprivacy/logic/bloc/volumes/volumes_bloc.dart';
@@ -146,20 +147,18 @@ class _Card extends StatelessWidget {
               crossAxisAlignment: CrossAxisAlignment.start,
               children: [
                 Row(
-                  mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                  mainAxisAlignment: MainAxisAlignment.start,
                   children: [
-                    Row(
-                      children: [
-                        IconStatusMask(
-                          status: state,
-                          icon: Icon(icon, size: 30, color: Colors.white),
-                        ),
-                        const SizedBox(width: 8),
-                        Text(
-                          title,
-                          style: Theme.of(context).textTheme.headlineMedium,
-                        ),
-                      ],
+                    IconStatusMask(
+                      status: state,
+                      icon: Icon(icon, size: 30, color: Colors.white),
+                    ),
+                    const Gap(8),
+                    Expanded(
+                      child: Text(
+                        title,
+                        style: Theme.of(context).textTheme.headlineMedium,
+                      ),
                     ),
                     if (state != StateType.uninitialized)
                       IconStatusMask(
diff --git a/lib/ui/pages/services/services.dart b/lib/ui/pages/services/services.dart
index 994e2040..684af19a 100644
--- a/lib/ui/pages/services/services.dart
+++ b/lib/ui/pages/services/services.dart
@@ -2,6 +2,7 @@ import 'package:auto_route/auto_route.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_svg/flutter_svg.dart';
+import 'package:gap/gap.dart';
 import 'package:selfprivacy/config/brand_theme.dart';
 import 'package:selfprivacy/logic/bloc/services/services_bloc.dart';
 import 'package:selfprivacy/logic/cubit/server_installation/server_installation_cubit.dart';
@@ -134,10 +135,12 @@ class _Card extends StatelessWidget {
                       ),
                     ),
                   ),
-                  const SizedBox(width: 8),
-                  Text(
-                    service.displayName,
-                    style: Theme.of(context).textTheme.headlineMedium,
+                  const Gap(8),
+                  Expanded(
+                    child: Text(
+                      service.displayName,
+                      style: Theme.of(context).textTheme.headlineMedium,
+                    ),
                   ),
                 ],
               ),