diff --git a/FlatCAMApp.py b/FlatCAMApp.py
index 58563d9a..d5377245 100644
--- a/FlatCAMApp.py
+++ b/FlatCAMApp.py
@@ -2920,12 +2920,12 @@ class App(QtCore.QObject):
         self.dblsidedtool.install(icon=QtGui.QIcon('share/doubleside16.png'), separator=True)
 
         self.distance_tool = Distance(self)
-        self.distance_tool.install(icon=QtGui.QIcon('share/measure16.png'), pos=self.ui.menuedit,
+        self.distance_tool.install(icon=QtGui.QIcon('share/distance16.png'), pos=self.ui.menuedit,
                                    before=self.ui.menueditorigin,
                                    separator=False)
 
         self.distance_min_tool = DistanceMin(self)
-        self.distance_min_tool.install(icon=QtGui.QIcon('share/measure16.png'), pos=self.ui.menuedit,
+        self.distance_min_tool.install(icon=QtGui.QIcon('share/distance_min16.png'), pos=self.ui.menuedit,
                                        before=self.ui.menueditorigin,
                                        separator=True)
 
@@ -3062,6 +3062,11 @@ class App(QtCore.QObject):
         self.ui.update_obj_btn.triggered.connect(lambda: self.editor2object())
         self.ui.delete_btn.triggered.connect(self.on_delete)
 
+        self.ui.distance_btn.triggered.connect(lambda: self.distance_tool.run(toggle=True))
+        self.ui.distance_min_btn.triggered.connect(lambda: self.distance_min_tool.run(toggle=True))
+        self.ui.origin_btn.triggered.connect(self.on_set_origin)
+        self.ui.jmp_btn.triggered.connect(self.on_jump_to)
+
         self.ui.shell_btn.triggered.connect(self.on_toggle_shell)
         self.ui.new_script_btn.triggered.connect(self.on_filenewscript)
         self.ui.open_script_btn.triggered.connect(self.on_fileopenscript)
diff --git a/README.md b/README.md
index e77c4efc..2776f97d 100644
--- a/README.md
+++ b/README.md
@@ -24,6 +24,7 @@ CAD program, and create G-Code for Isolation routing.
 - in Gerber isolation section, the tool dia value is updated when changing from Circular to V-shape and reverse
 - in Tool Film, when punching holes in a positive film, if the resulting object geometry is the same as the source object geometry, the film will not ge generated
 - fixed a bug that when a Gerber object is edited and it has as solid_geometry a single Polygon, saving the result was failing due of len() function not working on a single Polygon
+- added the Distance Tool, Distance Min Tool, Jump To and Set Origin functions to the Edit Toolbar
 
 3.10.2019
 
diff --git a/flatcamGUI/FlatCAMGUI.py b/flatcamGUI/FlatCAMGUI.py
index 0cf3fe8c..5a3018bb 100644
--- a/flatcamGUI/FlatCAMGUI.py
+++ b/flatcamGUI/FlatCAMGUI.py
@@ -317,7 +317,7 @@ class FlatCAMGUI(QtWidgets.QMainWindow):
 
         # Separator
         self.menuedit.addSeparator()
-        self.menueditorigin = self.menuedit.addAction(QtGui.QIcon('share/origin.png'), _('Se&t Origin\tO'))
+        self.menueditorigin = self.menuedit.addAction(QtGui.QIcon('share/origin16.png'), _('Se&t Origin\tO'))
         self.menueditjump = self.menuedit.addAction(QtGui.QIcon('share/jump_to16.png'), _('Jump to Location\tJ'))
 
         # Separator
@@ -688,6 +688,13 @@ class FlatCAMGUI(QtWidgets.QMainWindow):
 
         self.toolbargeo.addSeparator()
         self.delete_btn = self.toolbargeo.addAction(QtGui.QIcon('share/cancel_edit32.png'), _("&Delete"))
+        self.toolbargeo.addSeparator()
+        self.distance_btn = self.toolbargeo.addAction(QtGui.QIcon('share/distance32.png'), _("Distance Tool"))
+        self.distance_min_btn = self.toolbargeo.addAction(QtGui.QIcon('share/distance_min32.png'),
+                                                          _("Distance Min Tool"))
+        self.origin_btn = self.toolbargeo.addAction(QtGui.QIcon('share/origin32.png'), _('Set Origin'))
+        self.jmp_btn = self.toolbargeo.addAction(QtGui.QIcon('share/jump_to16.png'), _('Jump to Location'))
+
 
         # ########################################################################
         # ########################## View Toolbar# ###############################
@@ -712,7 +719,7 @@ class FlatCAMGUI(QtWidgets.QMainWindow):
         # ########################## Tools Toolbar# ##############################
         # ########################################################################
         self.dblsided_btn = self.toolbartools.addAction(QtGui.QIcon('share/doubleside32.png'), _("2Sided Tool"))
-        self.cutout_btn = self.toolbartools.addAction(QtGui.QIcon('share/cut16_bis.png'), _("&Cutout Tool"))
+        self.cutout_btn = self.toolbartools.addAction(QtGui.QIcon('share/cut16_bis.png'), _("Cutout Tool"))
         self.ncc_btn = self.toolbartools.addAction(QtGui.QIcon('share/ncc16.png'), _("NCC Tool"))
         self.paint_btn = self.toolbartools.addAction(QtGui.QIcon('share/paint20_1.png'), _("Paint Tool"))
         self.toolbartools.addSeparator()
@@ -2089,6 +2096,12 @@ class FlatCAMGUI(QtWidgets.QMainWindow):
 
         self.toolbargeo.addSeparator()
         self.delete_btn = self.toolbargeo.addAction(QtGui.QIcon('share/cancel_edit32.png'), _("&Delete"))
+        self.toolbargeo.addSeparator()
+        self.distance_btn = self.toolbargeo.addAction(QtGui.QIcon('share/distance32.png'), _("Distance Tool"))
+        self.distance_min_btn = self.toolbargeo.addAction(QtGui.QIcon('share/distance_min32.png'),
+                                                          _("Distance Min Tool"))
+        self.origin_btn = self.toolbargeo.addAction(QtGui.QIcon('share/origin32.png'), _('Set Origin'))
+        self.jmp_btn = self.toolbargeo.addAction(QtGui.QIcon('share/jump_to16.png'), _('Jump to Location'))
 
         # ## View Toolbar # ##
         self.replot_btn = self.toolbarview.addAction(QtGui.QIcon('share/replot32.png'), _("&Replot"))
diff --git a/share/distance16.png b/share/distance16.png
new file mode 100644
index 00000000..4e0d2ab1
Binary files /dev/null and b/share/distance16.png differ
diff --git a/share/distance32.png b/share/distance32.png
new file mode 100644
index 00000000..39cc3ca6
Binary files /dev/null and b/share/distance32.png differ
diff --git a/share/distance_min16.png b/share/distance_min16.png
new file mode 100644
index 00000000..4de09c90
Binary files /dev/null and b/share/distance_min16.png differ
diff --git a/share/distance_min32.png b/share/distance_min32.png
new file mode 100644
index 00000000..f11b9653
Binary files /dev/null and b/share/distance_min32.png differ
diff --git a/share/measure16.png b/share/measure16.png
deleted file mode 100644
index 82df1c10..00000000
Binary files a/share/measure16.png and /dev/null differ
diff --git a/share/measure32.png b/share/measure32.png
deleted file mode 100644
index fff4e305..00000000
Binary files a/share/measure32.png and /dev/null differ
diff --git a/share/origin16.png b/share/origin16.png
new file mode 100644
index 00000000..51e5f39b
Binary files /dev/null and b/share/origin16.png differ
diff --git a/share/origin32.png b/share/origin32.png
new file mode 100644
index 00000000..54bb977f
Binary files /dev/null and b/share/origin32.png differ