diff --git a/CHANGELOG.md b/CHANGELOG.md
index 39798946..fb245147 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,6 +17,7 @@ CHANGELOG for FlatCAM beta
 - Drilling Tool - first tool that benefit from using the object options instead of application defaults; this is useful if an object is recreated on project load
 - Drilling Tool - fixed it to update the UI form also for common parameters on object change
 - new Application Objects will hold all the options that start with 'tools_'
+- Tool Corners - fixed the positions of the drills and for the verification locations in the Drill in Locations and Check in Locations Excellon objects, to take in the consideration the tool diameter
 
 10.12.2020
 
diff --git a/appTools/ToolCorners.py b/appTools/ToolCorners.py
index 08f94cd7..5a84523a 100644
--- a/appTools/ToolCorners.py
+++ b/appTools/ToolCorners.py
@@ -381,29 +381,29 @@ class ToolCorners(AppTool):
         drill_list = []
 
         if tl_state:
-            x = xmin - margin - line_thickness / 2.0
-            y = ymax + margin + line_thickness / 2.0
+            x = xmin - margin - line_thickness / 2.0 + tooldia / 2.0
+            y = ymax + margin + line_thickness / 2.0 - tooldia / 2.0
             drill_list.append(
                 Point((x, y))
             )
 
         if tr_state:
-            x = xmax + margin + line_thickness / 2.0
-            y = ymax + margin + line_thickness / 2.0
+            x = xmax + margin + line_thickness / 2.0 - tooldia / 2.0
+            y = ymax + margin + line_thickness / 2.0 - tooldia / 2.0
             drill_list.append(
                 Point((x, y))
             )
 
         if bl_state:
-            x = xmin - margin - line_thickness / 2.0
-            y = ymin - margin - line_thickness / 2.0
+            x = xmin - margin - line_thickness / 2.0 + tooldia / 2.0
+            y = ymin - margin - line_thickness / 2.0 + tooldia / 2.0
             drill_list.append(
                 Point((x, y))
             )
 
         if br_state:
-            x = xmax + margin + line_thickness / 2.0
-            y = ymin - margin - line_thickness / 2.0
+            x = xmax + margin + line_thickness / 2.0 - tooldia / 2.0
+            y = ymin - margin - line_thickness / 2.0 + tooldia / 2.0
             drill_list.append(
                 Point((x, y))
             )
@@ -439,7 +439,7 @@ class ToolCorners(AppTool):
     def on_create_check_object(self):
         self.app.call_source = "corners_tool"
 
-        tooldia = self.ui.drill_dia_entry.get_value()
+        tooldia = 0.1 if self.units == 'MM' else 0.0254
 
         if tooldia == 0:
             self.app.inform.emit('[WARNING_NOTCL] %s %s' % (_("Cancelled."), _("The tool diameter is zero.")))
@@ -475,36 +475,36 @@ class ToolCorners(AppTool):
         drill_list = []
 
         if tl_state:
-            x = xmin - margin - line_thickness / 2.0
-            y = ymax + margin + line_thickness / 2.0
+            x = xmin - margin - line_thickness / 2.0 + tooldia / 2.0
+            y = ymax + margin + line_thickness / 2.0 - tooldia / 2.0
             drill_list.append(
                 Point((x, y))
             )
 
         if tr_state:
-            x = xmax + margin + line_thickness / 2.0
-            y = ymax + margin + line_thickness / 2.0
+            x = xmax + margin + line_thickness / 2.0 - tooldia / 2.0
+            y = ymax + margin + line_thickness / 2.0 - tooldia / 2.0
             drill_list.append(
                 Point((x, y))
             )
 
         if bl_state:
-            x = xmin - margin - line_thickness / 2.0
-            y = ymin - margin - line_thickness / 2.0
+            x = xmin - margin - line_thickness / 2.0 + tooldia / 2.0
+            y = ymin - margin - line_thickness / 2.0 + tooldia / 2.0
             drill_list.append(
                 Point((x, y))
             )
 
         if br_state:
-            x = xmax + margin + line_thickness / 2.0
-            y = ymin - margin - line_thickness / 2.0
+            x = xmax + margin + line_thickness / 2.0 - tooldia / 2.0
+            y = ymin - margin - line_thickness / 2.0 + tooldia / 2.0
             drill_list.append(
                 Point((x, y))
             )
 
         tools = {
             1: {
-                "tooldia": 0.1 if self.units == 'MM' else 0.0254,
+                "tooldia": tooldia,
                 "drills": drill_list,
                 'data': {},
                 "solid_geometry": []