diff --git a/lib/pages/chat/chat_view.dart b/lib/pages/chat/chat_view.dart
index b6aad7f3cd..8e4e293bf5 100644
--- a/lib/pages/chat/chat_view.dart
+++ b/lib/pages/chat/chat_view.dart
@@ -7,6 +7,7 @@ import 'package:desktop_drop/desktop_drop.dart';
 import 'package:flutter_gen/gen_l10n/l10n.dart';
 import 'package:matrix/matrix.dart';
 
+import 'package:fluffychat/config/app_config.dart';
 import 'package:fluffychat/config/themes.dart';
 import 'package:fluffychat/pages/chat/chat.dart';
 import 'package:fluffychat/pages/chat/chat_app_bar_list_tile.dart';
@@ -114,7 +115,8 @@ class ChatView extends StatelessWidget {
       ];
     } else if (!controller.room.isArchived) {
       return [
-        if (Matrix.of(context).voipPlugin != null &&
+        if (AppConfig.experimentalVoip &&
+            Matrix.of(context).voipPlugin != null &&
             controller.room.isDirectChat)
           IconButton(
             onPressed: controller.onPhoneButtonTap,
diff --git a/lib/pages/chat_details/chat_details_view.dart b/lib/pages/chat_details/chat_details_view.dart
index e802014923..c12e4843bb 100644
--- a/lib/pages/chat_details/chat_details_view.dart
+++ b/lib/pages/chat_details/chat_details_view.dart
@@ -207,6 +207,8 @@ class ChatDetailsView extends StatelessWidget {
                               label: Text(L10n.of(context).setChatDescription),
                               icon: const Icon(Icons.edit_outlined),
                               style: TextButton.styleFrom(
+                                iconColor:
+                                    theme.colorScheme.onSecondaryContainer,
                                 backgroundColor:
                                     theme.colorScheme.secondaryContainer,
                                 foregroundColor:
diff --git a/lib/pages/device_settings/device_settings_view.dart b/lib/pages/device_settings/device_settings_view.dart
index 01880512c6..57fb87cad7 100644
--- a/lib/pages/device_settings/device_settings_view.dart
+++ b/lib/pages/device_settings/device_settings_view.dart
@@ -99,6 +99,7 @@ class DevicesSettingsView extends StatelessWidget {
                                 L10n.of(context).removeAllOtherDevices,
                               ),
                               style: TextButton.styleFrom(
+                                iconColor: theme.colorScheme.onErrorContainer,
                                 foregroundColor:
                                     theme.colorScheme.onErrorContainer,
                                 backgroundColor: