diff --git a/flutter/lib/common/widgets/peer_tab_page.dart b/flutter/lib/common/widgets/peer_tab_page.dart
index daf81d231..d32458514 100644
--- a/flutter/lib/common/widgets/peer_tab_page.dart
+++ b/flutter/lib/common/widgets/peer_tab_page.dart
@@ -121,10 +121,13 @@ class _PeerTabPageState extends State<PeerTabPage>
                             : BoxDecoration(
                                 color: Theme.of(context).colorScheme.background,
                                 borderRadius: BorderRadius.circular(6)),
-                        child: Icon(
-                          Icons.tag_rounded,
-                          size: 18,
-                        ))),
+                        child: Tooltip(
+                          message: translate('Toggle Tags'),
+                          child: Icon(
+                            Icons.tag_rounded,
+                            size: 18,
+                        ))
+                    )),
                     onTap: () async {
                       await bind.mainSetLocalOption(
                           key: "hideAbTagsPanel",
@@ -217,11 +220,14 @@ class _PeerTabPageState extends State<PeerTabPage>
             },
             child: RotatedBox(
                 quarterTurns: 2,
-                child: Icon(
-                  Icons.refresh,
-                  size: 18,
-                  color: textColor,
-                ))),
+                child: Tooltip(
+                  message: translate('Refresh'),
+                  child: Icon(
+                    Icons.refresh,
+                    size: 18,
+                    color: textColor,
+                ))
+            )),
       ),
     );
   }
@@ -248,14 +254,18 @@ class _PeerTabPageState extends State<PeerTabPage>
                   k: 'peer-card-ui-type', v: type.index.toString());
               peerCardUiType.value = type;
             },
-            child: Icon(
-              peerCardUiType.value == PeerUiType.grid
-                  ? Icons.view_list_rounded
-                  : Icons.grid_view_rounded,
-              size: 18,
-              color: textColor,
-            )),
-      ),
+            child: Tooltip(
+                message: peerCardUiType.value == PeerUiType.grid
+                    ? translate('List View')
+                    : translate('Grid View'),
+                child: Icon(
+                  peerCardUiType.value == PeerUiType.grid
+                      ? Icons.view_list_rounded
+                      : Icons.grid_view_rounded,
+                  size: 18,
+                  color: textColor,
+            ))
+        )),
     );
   }
 
@@ -269,11 +279,13 @@ class _PeerTabPageState extends State<PeerTabPage>
         onTap: () {
           model.setMultiSelectionMode(true);
         },
-        child: Icon(
-          IconFont.checkbox,
-          size: 18,
-          color: textColor,
-        ),
+        child: Tooltip(
+          message: translate('Select'),
+          child: Icon(
+            IconFont.checkbox,
+            size: 18,
+            color: textColor,
+          )),
       ),
     );
   }
@@ -466,10 +478,13 @@ class _PeerSearchBarState extends State<PeerSearchBar> {
                 drawer = true;
               });
             },
-            icon: Icon(
-              Icons.search_rounded,
-              color: Theme.of(context).hintColor,
-            ));
+            icon: Tooltip(
+                message: translate('Search'),
+                child: Icon(
+                  Icons.search_rounded,
+                  color: Theme.of(context).hintColor,
+            ))
+          );
   }
 
   Widget _buildSearchBar() {
@@ -537,10 +552,14 @@ class _PeerSearchBarState extends State<PeerSearchBar> {
                             drawer = false;
                           });
                         },
-                        icon: Icon(
-                          Icons.close,
-                          color: Theme.of(context).hintColor,
+                        icon: Tooltip(
+                            message: translate('Close'),
+                            child:
+                            Icon(
+                              Icons.close,
+                              color: Theme.of(context).hintColor,
                         )),
+                    ),
                   ],
                 ),
               )
@@ -604,10 +623,12 @@ class _PeerSortDropdownState extends State<PeerSortDropdown> {
 
     var menuPos = RelativeRect.fromLTRB(0, 0, 0, 0);
     return InkWell(
-      child: Icon(
-        Icons.sort_rounded,
-        size: 18,
-      ),
+      child: Tooltip(
+          message: translate('Sort By'),
+          child: Icon(
+            Icons.sort_rounded,
+            size: 18,
+      )),
       onTapDown: (details) {
         final x = details.globalPosition.dx;
         final y = details.globalPosition.dy;
diff --git a/flutter/lib/desktop/pages/desktop_home_page.dart b/flutter/lib/desktop/pages/desktop_home_page.dart
index 7bf303a68..d458402d3 100644
--- a/flutter/lib/desktop/pages/desktop_home_page.dart
+++ b/flutter/lib/desktop/pages/desktop_home_page.dart
@@ -185,11 +185,13 @@ class _DesktopHomePageState extends State<DesktopHomePage>
           backgroundColor: hover.value
               ? Theme.of(context).scaffoldBackgroundColor
               : Theme.of(context).colorScheme.background,
-          child: Icon(
-            Icons.more_vert_outlined,
-            size: 20,
-            color: hover.value ? textColor : textColor?.withOpacity(0.5),
-          ),
+          child: Tooltip(
+            message: translate('Settings'),
+            child: Icon(
+              Icons.more_vert_outlined,
+              size: 20,
+              color: hover.value ? textColor : textColor?.withOpacity(0.5),
+            )),
         ),
       ),
       onHover: (value) => hover.value = value,
@@ -252,23 +254,28 @@ class _DesktopHomePageState extends State<DesktopHomePage>
                         onPressed: () => bind.mainUpdateTemporaryPassword(),
                         child: Obx(() => RotatedBox(
                             quarterTurns: 2,
-                            child: Icon(
-                              Icons.refresh,
-                              color: refreshHover.value
-                                  ? textColor
-                                  : Color(0xFFDDDDDD),
-                              size: 22,
-                            ))),
+                            child: Tooltip(
+                              message: translate('Refresh Password'),
+                              child: Icon(
+                                Icons.refresh,
+                                color: refreshHover.value
+                                    ? textColor
+                                    : Color(0xFFDDDDDD),
+                                size: 22,
+                              ))
+                            )),
                         onHover: (value) => refreshHover.value = value,
                       ).marginOnly(right: 8, top: 4),
                       InkWell(
                         child: Obx(
-                          () => Icon(
-                            Icons.edit,
-                            color:
-                                editHover.value ? textColor : Color(0xFFDDDDDD),
-                            size: 22,
-                          ).marginOnly(right: 8, top: 4),
+                          () => Tooltip(
+                            message: translate('Change Password'),
+                            child: Icon(
+                              Icons.edit,
+                              color:
+                                  editHover.value ? textColor : Color(0xFFDDDDDD),
+                              size: 22,
+                            )).marginOnly(right: 8, top: 4),
                         ),
                         onTap: () => DesktopSettingPage.switch2page(1),
                         onHover: (value) => editHover.value = value,