diff --git a/FlatCAMApp.py b/FlatCAMApp.py
index 93a1f943..812079ad 100644
--- a/FlatCAMApp.py
+++ b/FlatCAMApp.py
@@ -3263,9 +3263,11 @@ class App(QtCore.QObject):
 
         # Changing project units. Warn user.
         msgbox = QtWidgets.QMessageBox()
+        msgbox.setWindowTitle("Toggle Units")
+        msgbox.setWindowIcon(QtGui.QIcon('share/toggle_units32.png'))
         msgbox.setText("<B>Change project units ...</B>")
         msgbox.setInformativeText("Changing the units of the project causes all geometrical "
-                                  "properties of all objects to be scaled accordingly. Continue?")
+                                  "properties of all objects to be scaled accordingly.\nContinue?")
         msgbox.setStandardButtons(QtWidgets.QMessageBox.Cancel | QtWidgets.QMessageBox.Ok)
         msgbox.setDefaultButton(QtWidgets.QMessageBox.Ok)
 
diff --git a/README.md b/README.md
index b2255a00..7f43f62e 100644
--- a/README.md
+++ b/README.md
@@ -14,6 +14,7 @@ CAD program, and create G-Code for Isolation routing.
 - added autocomplete finish with ENTER key for the TCL Shell
 - made sure that the autocomplete function works only for FlatCAM Scripts
 - ESC key will trigger normal view if in full screen and the ESC key is pressed
+- added an icon and title text for the Toggle Units QMessageBox
 
 19.03.2019