diff --git a/CHANGELOG.md b/CHANGELOG.md
index 94749132..07220115 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,7 @@ CHANGELOG for FlatCAM beta
 - updated the Geometry UI to work with the new FCTable
 - made the coordinates / delta coordinates / grid toolbar / actions toolbar visibility an option, controlled from the infobar (Status bar) context menu. How it's at app shutdown it's restored at the next application start
 - moved the init of activity view in the MainGUI file from the APP.__init__()
+- added a new string in the tooltip for the button that adds tool from database specifying the tools database administration is done in the menu
 
 12.06.2020
 
diff --git a/appGUI/ObjectUI.py b/appGUI/ObjectUI.py
index 3bf479a6..825b4c97 100644
--- a/appGUI/ObjectUI.py
+++ b/appGUI/ObjectUI.py
@@ -1500,7 +1500,8 @@ class GeometryObjectUI(ObjectUI):
         self.addtool_from_db_btn = QtWidgets.QPushButton(_('Add from DB'))
         self.addtool_from_db_btn.setToolTip(
             _("Add a new tool to the Tool Table\n"
-              "from the Tool DataBase.")
+              "from the Tool Database.\n"
+              "Tool database administration in Menu: Options -> Tools Database")
         )
 
         bhlay.addWidget(self.addtool_btn)
diff --git a/appTools/ToolIsolation.py b/appTools/ToolIsolation.py
index f5e9dcb0..f369c18a 100644
--- a/appTools/ToolIsolation.py
+++ b/appTools/ToolIsolation.py
@@ -282,7 +282,8 @@ class ToolIsolation(AppTool, Gerber):
         self.addtool_from_db_btn = QtWidgets.QPushButton(_('Add from DB'))
         self.addtool_from_db_btn.setToolTip(
             _("Add a new tool to the Tool Table\n"
-              "from the Tool DataBase.")
+              "from the Tool Database.\n"
+              "Tool database administration in Menu: Options -> Tools Database")
         )
 
         bhlay.addWidget(self.addtool_btn)
diff --git a/appTools/ToolNCC.py b/appTools/ToolNCC.py
index ebd840a8..d6750e61 100644
--- a/appTools/ToolNCC.py
+++ b/appTools/ToolNCC.py
@@ -3784,7 +3784,8 @@ class NccUI:
         self.addtool_from_db_btn = QtWidgets.QPushButton(_('Add from DB'))
         self.addtool_from_db_btn.setToolTip(
             _("Add a new tool to the Tool Table\n"
-              "from the Tool DataBase.")
+              "from the Tool Database.\n"
+              "Tool database administration in Menu: Options -> Tools Database")
         )
 
         hlay.addWidget(self.addtool_btn)
diff --git a/appTools/ToolPaint.py b/appTools/ToolPaint.py
index 7ec666bc..fc2c51a3 100644
--- a/appTools/ToolPaint.py
+++ b/appTools/ToolPaint.py
@@ -282,7 +282,8 @@ class ToolPaint(AppTool, Gerber):
         self.addtool_from_db_btn = QtWidgets.QPushButton(_('Add from DB'))
         self.addtool_from_db_btn.setToolTip(
             _("Add a new tool to the Tool Table\n"
-              "from the Tool DataBase.")
+              "from the Tool Database.\n"
+              "Tool database administration in Menu: Options -> Tools Database")
         )
 
         hlay.addWidget(self.addtool_btn)