diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2e421f00..1b84bdfa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -26,6 +26,7 @@ CHANGELOG for FlatCAM beta
 - some refactoring between app_Main class and MainGUI class
 - on tab close in Notebook the tool_shapes are deleted (shape markings used by some of the App Tools) therefore part fo the clean-up
 - added some protections in case the Editors could not start such that the app is not crashed
+- fixed wrong display of editor actions in the Editor toolbar at the first start of the app
 
 26.11.2020
 
diff --git a/appGUI/MainGUI.py b/appGUI/MainGUI.py
index 375c65c2..85563fb2 100644
--- a/appGUI/MainGUI.py
+++ b/appGUI/MainGUI.py
@@ -2191,7 +2191,7 @@ class MainGUI(QtWidgets.QMainWindow):
         # ######################### Edit Toolbar #################################
         # ########################################################################
         self.editor_start_btn = self.toolbaredit.addAction(
-            QtGui.QIcon(self.app.resource_location + '/edit32.png'), _("Editor"))
+            QtGui.QIcon(self.app.resource_location + '/edit_file32.png'), _("Editor"))
         self.editor_exit_btn = QtWidgets.QToolButton()
 
         # https://www.w3.org/TR/SVG11/types.html#ColorKeywords
@@ -2452,6 +2452,7 @@ class MainGUI(QtWidgets.QMainWindow):
 
         self.corner_snap_btn.setVisible(False)
         self.snap_magnet.setVisible(False)
+        self.editor_exit_btn_ret_action.setVisible(False)
 
         qsettings = QSettings("Open Source", "FlatCAM")
         if qsettings.contains("layout"):