diff --git a/lib/account_manager/views/edit_profile_form.dart b/lib/account_manager/views/edit_profile_form.dart
index 114c7b8..c4f84da 100644
--- a/lib/account_manager/views/edit_profile_form.dart
+++ b/lib/account_manager/views/edit_profile_form.dart
@@ -103,14 +103,14 @@ class _EditProfileFormState extends State<EditProfileForm> {
           labelText: translate('account.form_availability'),
           hintText: translate('account.empty_busy_message')),
       items: availabilities
-          .map((x) => DropdownMenuItem<proto.Availability>(
-              value: x,
+          .map((availability) => DropdownMenuItem<proto.Availability>(
+              value: availability,
               child: Row(mainAxisSize: MainAxisSize.min, children: [
                 AvailabilityWidget.availabilityIcon(
-                    x, scale.primaryScale.appText),
-                Text(x == proto.Availability.AVAILABILITY_OFFLINE
+                    context, availability, scale.primaryScale.appText),
+                Text(availability == proto.Availability.AVAILABILITY_OFFLINE
                         ? translate('availability.always_show_offline')
-                        : AvailabilityWidget.availabilityName(x))
+                        : AvailabilityWidget.availabilityName(availability))
                     .paddingLTRB(8.scaled(context), 0, 0, 0),
               ])))
           .toList(),
diff --git a/lib/contacts/views/availability_widget.dart b/lib/contacts/views/availability_widget.dart
index 55fac39..5ef6080 100644
--- a/lib/contacts/views/availability_widget.dart
+++ b/lib/contacts/views/availability_widget.dart
@@ -4,6 +4,7 @@ import 'package:flutter_svg/flutter_svg.dart';
 import 'package:flutter_translate/flutter_translate.dart';
 
 import '../../proto/proto.dart' as proto;
+import '../../theme/theme.dart';
 
 class AvailabilityWidget extends StatelessWidget {
   const AvailabilityWidget(
@@ -13,6 +14,7 @@ class AvailabilityWidget extends StatelessWidget {
       super.key});
 
   static Widget availabilityIcon(
+    BuildContext context,
     proto.Availability availability,
     Color color,
   ) {
@@ -20,15 +22,17 @@ class AvailabilityWidget extends StatelessWidget {
     switch (availability) {
       case proto.Availability.AVAILABILITY_AWAY:
         icon = SvgPicture.asset('assets/images/toilet.svg',
+            width: 24.scaled(context),
+            height: 24.scaled(context),
             colorFilter: ColorFilter.mode(color, BlendMode.srcATop));
       case proto.Availability.AVAILABILITY_BUSY:
-        icon = const Icon(Icons.event_busy, applyTextScaling: true);
+        icon = Icon(size: 24.scaled(context), Icons.event_busy);
       case proto.Availability.AVAILABILITY_FREE:
-        icon = const Icon(Icons.event_available, applyTextScaling: true);
+        icon = Icon(size: 24.scaled(context), Icons.event_available);
       case proto.Availability.AVAILABILITY_OFFLINE:
-        icon = const Icon(Icons.cloud_off, applyTextScaling: true);
+        icon = Icon(size: 24.scaled(context), Icons.cloud_off);
       case proto.Availability.AVAILABILITY_UNSPECIFIED:
-        icon = const Icon(Icons.question_mark, applyTextScaling: true);
+        icon = Icon(size: 24.scaled(context), Icons.question_mark);
     }
     return icon;
   }
@@ -56,7 +60,7 @@ class AvailabilityWidget extends StatelessWidget {
     final textTheme = theme.textTheme;
 
     final name = availabilityName(availability);
-    final icon = availabilityIcon(availability, color);
+    final icon = availabilityIcon(context, availability, color);
 
     return vertical
         ? Column(mainAxisSize: MainAxisSize.min, children: [