diff --git a/lib/features/workspace/widgets/toolbar.dart b/lib/features/workspace/widgets/toolbar.dart
index fc0822a..56a3c26 100644
--- a/lib/features/workspace/widgets/toolbar.dart
+++ b/lib/features/workspace/widgets/toolbar.dart
@@ -47,7 +47,7 @@ class ToolBar extends StatelessWidget {
           ),
           child:
               device == rh.DeviceType.mobile
-                  ? FittedBox(       
+                  ? FittedBox(
                     fit: BoxFit.scaleDown,
                     child: Row(
                       mainAxisSize: MainAxisSize.min,
@@ -61,7 +61,7 @@ class ToolBar extends StatelessWidget {
                               context,
                               provider,
                               device,
-                              suprovider
+                              suprovider,
                             ); // Pass the provider
                           },
                           backgroundColor:
@@ -77,7 +77,7 @@ class ToolBar extends StatelessWidget {
                           'Add new node',
                           device,
                           onPressed: () {
-                            _showNodePicker(context, device,suprovider);
+                            _showNodePicker(context, device, suprovider);
                           },
                           backgroundColor:
                               suprovider.isDark
@@ -165,7 +165,9 @@ class ToolBar extends StatelessWidget {
                               provider.currentMode == DrawMode.stickyNote
                                   ? Colors.blue
                                   : tertiaryColors[6],
-                          onPressed: () => _showStickyNote(context, device,suprovider),
+                          onPressed:
+                              () =>
+                                  _showStickyNote(context, device, suprovider),
                           backgroundColor:
                               suprovider.isDark
                                   ? Color.fromRGBO(48, 48, 48, 1)
@@ -186,7 +188,7 @@ class ToolBar extends StatelessWidget {
                             context,
                             provider,
                             device,
-                            suprovider
+                            suprovider,
                           ); // Pass the provider
                         },
                         backgroundColor:
@@ -202,7 +204,7 @@ class ToolBar extends StatelessWidget {
                         'Add new node',
                         device,
                         onPressed: () {
-                          _showNodePicker(context, device,suprovider);
+                          _showNodePicker(context, device, suprovider);
                         },
                         backgroundColor:
                             suprovider.isDark
@@ -214,7 +216,7 @@ class ToolBar extends StatelessWidget {
                       _horizontalDivider(device),
                       _toolIcon(
                         PhosphorIconsRegular.cursor,
-                        'Pointer',
+                        'Pointer\nPress P',
                         device,
                         iconColor:
                             provider.currentMode == DrawMode.pointer
@@ -233,7 +235,7 @@ class ToolBar extends StatelessWidget {
                       _horizontalDivider(device),
                       _toolIcon(
                         PhosphorIconsRegular.handGrabbing,
-                        'Pan',
+                        'Pan\nPress A',
                         device,
                         iconColor:
                             provider.currentMode == DrawMode.hand
@@ -252,7 +254,7 @@ class ToolBar extends StatelessWidget {
                       _horizontalDivider(device),
                       _toolIcon(
                         PhosphorIconsRegular.textT,
-                        'Text box',
+                        'Text box\nPress T',
                         device,
                         iconColor:
                             provider.currentMode == DrawMode.textBox
@@ -284,13 +286,14 @@ class ToolBar extends StatelessWidget {
                       _horizontalDivider(device),
                       _toolIcon(
                         PhosphorIconsFill.noteBlank,
-                        'Add new sticky note',
+                        'Add new sticky note\nPress S',
                         device,
                         iconColor:
                             provider.currentMode == DrawMode.stickyNote
                                 ? Colors.blue
                                 : tertiaryColors[6],
-                        onPressed: () => _showStickyNote(context, device,suprovider),
+                        onPressed:
+                            () => _showStickyNote(context, device, suprovider),
                         backgroundColor:
                             suprovider.isDark
                                 ? Color.fromRGBO(48, 48, 48, 1)
@@ -346,7 +349,11 @@ class ToolBar extends StatelessWidget {
     );
   }
 
-  void _showNodePicker(BuildContext context, rh.DeviceType device,SupabaseService su) {
+  void _showNodePicker(
+    BuildContext context,
+    rh.DeviceType device,
+    SupabaseService su,
+  ) {
     final RenderBox? renderBox = context.findRenderObject() as RenderBox?;
     if (renderBox == null) return;
 
@@ -385,7 +392,7 @@ class ToolBar extends StatelessWidget {
               left: leftPos,
               child: Material(
                 color: Colors.transparent,
-                child: NodePicker(su: su,),
+                child: NodePicker(su: su),
               ),
             ),
           ],
@@ -398,7 +405,7 @@ class ToolBar extends StatelessWidget {
     BuildContext context,
     WorkspaceProvider provider,
     rh.DeviceType device,
-    SupabaseService su
+    SupabaseService su,
   ) {
     final RenderBox? renderBox = context.findRenderObject() as RenderBox?;
     if (renderBox != null) {
@@ -448,7 +455,11 @@ class ToolBar extends StatelessWidget {
     }
   }
 
-  void _showStickyNote(BuildContext context, rh.DeviceType device,SupabaseService su) {
+  void _showStickyNote(
+    BuildContext context,
+    rh.DeviceType device,
+    SupabaseService su,
+  ) {
     final RenderBox? renderBox = context.findRenderObject() as RenderBox?;
     if (renderBox != null) {
       final position = renderBox.localToGlobal(Offset.zero);
@@ -465,7 +476,7 @@ class ToolBar extends StatelessWidget {
                   ),
                 ),
                 Positioned(
-                  right:device == rh.DeviceType.mobile ? position.dx : 150.w ,
+                  right: device == rh.DeviceType.mobile ? position.dx : 150.w,
                   top:
                       device == rh.DeviceType.desktop
                           ? 500.h
@@ -474,7 +485,7 @@ class ToolBar extends StatelessWidget {
                           : position.dy - 390.h,
                   child: Material(
                     color: Colors.transparent,
-                    child: StickyNotesWidget(su: su,),
+                    child: StickyNotesWidget(su: su),
                   ),
                 ),
               ],
diff --git a/lib/features/workspace/widgets/zoom_control_button.dart b/lib/features/workspace/widgets/zoom_control_button.dart
index c6819d8..80a3c30 100644
--- a/lib/features/workspace/widgets/zoom_control_button.dart
+++ b/lib/features/workspace/widgets/zoom_control_button.dart
@@ -13,13 +13,22 @@ class ZoomControlButton extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final device = rh.ResponsiveLayoutHelper.getDeviceType(context);
-    return Consumer2<CanvasProvider,SupabaseService>(
-      builder: (context, canvasProvider,suprovider, child) {
+    return Consumer2<CanvasProvider, SupabaseService>(
+      builder: (context, canvasProvider, suprovider, child) {
         return Container(
           padding: EdgeInsets.symmetric(horizontal: 20.w, vertical: 16.h),
           decoration: BoxDecoration(
-            border: Border.all(color:suprovider.isDark ? Color.fromRGBO(75, 75, 75, 1) :const Color(0XFFD9D9D9), width: 1.2),
-            color:suprovider.isDark ? Color.fromRGBO(48, 48, 48, 1) : Colors.white,
+            border: Border.all(
+              color:
+                  suprovider.isDark
+                      ? Color.fromRGBO(75, 75, 75, 1)
+                      : const Color(0XFFD9D9D9),
+              width: 1.2,
+            ),
+            color:
+                suprovider.isDark
+                    ? Color.fromRGBO(48, 48, 48, 1)
+                    : Colors.white,
             borderRadius: BorderRadius.circular(12.r),
           ),
           child: Row(
@@ -49,6 +58,7 @@ class ZoomControlButton extends StatelessWidget {
               VerticalCustomDivider(),
               SizedBox(width: 8.w),
               IconButton(
+                tooltip: "Press Z",
                 onPressed: () {
                   canvasProvider.zoomIn(); // Call zoomIn method
                 },
@@ -67,6 +77,7 @@ class ZoomControlButton extends StatelessWidget {
               VerticalCustomDivider(),
               SizedBox(width: 8.w),
               IconButton(
+                tooltip: 'Press X',
                 onPressed: () {
                   canvasProvider.zoomOut(); // Call zoomOut method
                 },
@@ -98,7 +109,7 @@ class ZoomControlButton extends StatelessWidget {
                           : 60.sp,
                 ), // Icon for reset
                 visualDensity: VisualDensity.compact,
-                tooltip: 'Reset Zoom',
+                tooltip: 'Reset Zoom\nPress R',
               ),
             ],
           ),