diff --git a/flutter/lib/common.dart b/flutter/lib/common.dart
index ae6f04d2d..ba45bb4a8 100644
--- a/flutter/lib/common.dart
+++ b/flutter/lib/common.dart
@@ -133,6 +133,7 @@ class MyTheme {
     scaffoldBackgroundColor: Color(0xFFEEEEEE),
     textTheme: const TextTheme(
       titleLarge: TextStyle(fontSize: 19, color: Colors.black87),
+      titleSmall: TextStyle(fontSize: 14, color: Colors.black87),
       bodySmall: TextStyle(fontSize: 12, color: Colors.black54, height: 1.25),
       bodyMedium: TextStyle(fontSize: 14, color: Colors.black54, height: 1.25),
     ),
@@ -162,6 +163,7 @@ class MyTheme {
     scaffoldBackgroundColor: Color(0xFF141414),
     textTheme: const TextTheme(
         titleLarge: TextStyle(fontSize: 19),
+        titleSmall: TextStyle(fontSize: 14),
         bodySmall: TextStyle(fontSize: 12, height: 1.25),
         bodyMedium: TextStyle(fontSize: 14, height: 1.25)),
     cardColor: Color(0xFF252525),
diff --git a/flutter/lib/common/widgets/peer_card.dart b/flutter/lib/common/widgets/peer_card.dart
index 6ebdccbb0..e47f0de39 100644
--- a/flutter/lib/common/widgets/peer_card.dart
+++ b/flutter/lib/common/widgets/peer_card.dart
@@ -169,6 +169,7 @@ class _PeerCardState extends State<_PeerCard>
                                 child: Text(
                               alias.isEmpty ? formatID(peer.id) : alias,
                               overflow: TextOverflow.ellipsis,
+                              style: Theme.of(context).textTheme.titleSmall,
                             )),
                           ]).marginOnly(bottom: 2),
                           Align(
@@ -261,6 +262,7 @@ class _PeerCardState extends State<_PeerCard>
                             child: Text(
                           peer.alias.isEmpty ? formatID(peer.id) : peer.alias,
                           overflow: TextOverflow.ellipsis,
+                          style: Theme.of(context).textTheme.titleSmall,
                         )),
                       ]).paddingSymmetric(vertical: 8)),
                       _actionMore(peer),
diff --git a/flutter/lib/desktop/pages/remote_tab_page.dart b/flutter/lib/desktop/pages/remote_tab_page.dart
index e84b574fd..88b46bbd8 100644
--- a/flutter/lib/desktop/pages/remote_tab_page.dart
+++ b/flutter/lib/desktop/pages/remote_tab_page.dart
@@ -9,6 +9,7 @@ import 'package:flutter_hbb/consts.dart';
 import 'package:flutter_hbb/desktop/pages/remote_page.dart';
 import 'package:flutter_hbb/desktop/widgets/tabbar_widget.dart';
 import 'package:flutter_hbb/utils/multi_window_manager.dart';
+import 'package:flutter_svg/flutter_svg.dart';
 import 'package:get/get.dart';
 
 import '../../mobile/widgets/dialog.dart';
@@ -127,8 +128,8 @@ class _ConnectionTabPageState extends State<ConnectionTabPage> {
                     icon,
                     Tooltip(
                       message: '$msgDirect\n$msgSecure',
-                      child: Image.asset(
-                        'assets/${connectionType.secure.value}${connectionType.direct.value}.png',
+                      child: SvgPicture.asset(
+                        'assets/${connectionType.secure.value}${connectionType.direct.value}.svg',
                         width: themeConf.iconSize,
                         height: themeConf.iconSize,
                       ).paddingOnly(right: 5),
diff --git a/flutter/lib/desktop/widgets/button.dart b/flutter/lib/desktop/widgets/button.dart
index b8f1bfe83..695302a9e 100644
--- a/flutter/lib/desktop/widgets/button.dart
+++ b/flutter/lib/desktop/widgets/button.dart
@@ -73,10 +73,10 @@ class _ButtonState extends State<Button> {
                   ),
                   style: TextStyle(
                       fontSize: widget.textSize ?? 12.0,
-                      color: pressed.value || !widget.isOutline
-                          ? Theme.of(context).backgroundColor
-                          : widget.textColor ??
-                              Theme.of(context).textTheme.titleLarge?.color),
+                      color: widget.isOutline
+                          ? widget.textColor ??
+                              Theme.of(context).textTheme.titleLarge?.color
+                          : Colors.white),
                 ).marginSymmetric(horizontal: 12),
               )),
         ));