diff --git a/bec_widgets/widgets/motor_map/assets/connection.svg b/bec_widgets/widgets/motor_map/assets/connection.svg
index 3b31c422..c0e58f53 100644
--- a/bec_widgets/widgets/motor_map/assets/connection.svg
+++ b/bec_widgets/widgets/motor_map/assets/connection.svg
@@ -1,4 +1,4 @@
 <svg xmlns="http://www.w3.org/2000/svg" height="48px" viewBox="0 0 24 24" width="48px" fill="#FFFFFF">
     <path d="M0 0h24v24H0V0z" fill="none"/>
-    <path d="M18 7V4c0-1.1-.9-2-2-2H8c-1.1 0-2 .9-2 2v3H5v6l3 6v3h8v-3l3-6V7h-1zM8 4h8v3h-2.01V5h-1v2H11V5h-1v2H8V4zm9 8.53l-3 6V20h-4v-1.47l-3-6V9h10v3.53z"/>
+    <path d="M17 7h-4v2h4c1.65 0 3 1.35 3 3s-1.35 3-3 3h-4v2h4c2.76 0 5-2.24 5-5s-2.24-5-5-5zm-6 8H7c-1.65 0-3-1.35-3-3s1.35-3 3-3h4V7H7c-2.76 0-5 2.24-5 5s2.24 5 5 5h4v-2zm-3-4h8v2H8z"/>
 </svg>
\ No newline at end of file
diff --git a/bec_widgets/widgets/motor_map/motor_map_dialog/__init__.py b/bec_widgets/widgets/motor_map/motor_map_dialog/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/bec_widgets/widgets/motor_map/motor_map_settings.py b/bec_widgets/widgets/motor_map/motor_map_dialog/motor_map_settings.py
similarity index 100%
rename from bec_widgets/widgets/motor_map/motor_map_settings.py
rename to bec_widgets/widgets/motor_map/motor_map_dialog/motor_map_settings.py
diff --git a/bec_widgets/widgets/motor_map/motor_map_settings.ui b/bec_widgets/widgets/motor_map/motor_map_dialog/motor_map_settings.ui
similarity index 100%
rename from bec_widgets/widgets/motor_map/motor_map_settings.ui
rename to bec_widgets/widgets/motor_map/motor_map_dialog/motor_map_settings.ui
diff --git a/bec_widgets/widgets/motor_map/motor_map_toolbar.py b/bec_widgets/widgets/motor_map/motor_map_dialog/motor_map_toolbar.py
similarity index 73%
rename from bec_widgets/widgets/motor_map/motor_map_toolbar.py
rename to bec_widgets/widgets/motor_map/motor_map_dialog/motor_map_toolbar.py
index 2fd7f4be..4e16a5a9 100644
--- a/bec_widgets/widgets/motor_map/motor_map_toolbar.py
+++ b/bec_widgets/widgets/motor_map/motor_map_dialog/motor_map_toolbar.py
@@ -32,8 +32,9 @@ class DeviceSelectionAction(ToolBarAction):
 class ConnectAction(ToolBarAction):
     def add_to_toolbar(self, toolbar, target):
         current_path = os.path.dirname(__file__)
+        parent_path = os.path.dirname(current_path)
         icon = QIcon()
-        icon.addFile(os.path.join(current_path, "assets", "connection.svg"), size=QSize(20, 20))
+        icon.addFile(os.path.join(parent_path, "assets", "connection.svg"), size=QSize(20, 20))
         self.action = QAction(icon, "Connect Motors", target)
         toolbar.addAction(self.action)
 
@@ -41,16 +42,18 @@ class ConnectAction(ToolBarAction):
 class ResetHistoryAction(ToolBarAction):
     def add_to_toolbar(self, toolbar, target):
         current_path = os.path.dirname(__file__)
+        parent_path = os.path.dirname(current_path)
         icon = QIcon()
-        icon.addFile(os.path.join(current_path, "assets", "history.svg"), size=QSize(20, 20))
-        self.action = QAction(icon, "Reset History", target)
+        icon.addFile(os.path.join(parent_path, "assets", "history.svg"), size=QSize(20, 20))
+        self.action = QAction(icon, "Reset Trace History", target)
         toolbar.addAction(self.action)
 
 
 class SettingsAction(ToolBarAction):
     def add_to_toolbar(self, toolbar, target):
         current_path = os.path.dirname(__file__)
+        parent_path = os.path.dirname(current_path)
         icon = QIcon()
-        icon.addFile(os.path.join(current_path, "assets", "settings.svg"), size=QSize(20, 20))
-        self.action = QAction(icon, "Config", target)
+        icon.addFile(os.path.join(parent_path, "assets", "settings.svg"), size=QSize(20, 20))
+        self.action = QAction(icon, "Open Configuration Dialog", target)
         toolbar.addAction(self.action)
diff --git a/bec_widgets/widgets/motor_map/motor_map_widget.py b/bec_widgets/widgets/motor_map/motor_map_widget.py
index 1af15507..6d76f309 100644
--- a/bec_widgets/widgets/motor_map/motor_map_widget.py
+++ b/bec_widgets/widgets/motor_map/motor_map_widget.py
@@ -5,8 +5,8 @@ from qtpy.QtWidgets import QVBoxLayout, QWidget
 from bec_widgets.utils import BECConnector
 from bec_widgets.widgets.figure import BECFigure
 from bec_widgets.widgets.figure.plots.motor_map.motor_map import MotorMapConfig
-from bec_widgets.widgets.motor_map.motor_map_settings import MotorMapDialog
-from bec_widgets.widgets.motor_map.motor_map_toolbar import (
+from bec_widgets.widgets.motor_map.motor_map_dialog.motor_map_settings import MotorMapDialog
+from bec_widgets.widgets.motor_map.motor_map_dialog.motor_map_toolbar import (
     ConnectAction,
     DeviceSelectionAction,
     ResetHistoryAction,