diff --git a/documentation/current/eiffelstudio/_images/Customize_toolbar_dialog.png b/documentation/current/eiffelstudio/_images/Customize_toolbar_dialog.png
new file mode 100644
index 00000000..19f290e6
Binary files /dev/null and b/documentation/current/eiffelstudio/_images/Customize_toolbar_dialog.png differ
diff --git a/documentation/current/eiffelstudio/_images/Customize_toolbar_dialog.png.data b/documentation/current/eiffelstudio/_images/Customize_toolbar_dialog.png.data
new file mode 100644
index 00000000..9876424f
--- /dev/null
+++ b/documentation/current/eiffelstudio/_images/Customize_toolbar_dialog.png.data
@@ -0,0 +1,3 @@
+title=Customize toolbar dialog
+author=halw
+path=content/customize-toolbar-dialog
diff --git a/documentation/current/eiffelstudio/_images/toolbar-context-menu.png b/documentation/current/eiffelstudio/_images/toolbar-context-menu.png
new file mode 100644
index 00000000..616af67c
Binary files /dev/null and b/documentation/current/eiffelstudio/_images/toolbar-context-menu.png differ
diff --git a/documentation/current/eiffelstudio/_images/toolbar-context-menu.png.data b/documentation/current/eiffelstudio/_images/toolbar-context-menu.png.data
new file mode 100644
index 00000000..17a5400d
--- /dev/null
+++ b/documentation/current/eiffelstudio/_images/toolbar-context-menu.png.data
@@ -0,0 +1,3 @@
+title=toolbar-context-menu
+author=halw
+path=content/toolbar-context-menu
diff --git a/documentation/current/eiffelstudio/_images/toolbar-options-dropdown.png b/documentation/current/eiffelstudio/_images/toolbar-options-dropdown.png
new file mode 100644
index 00000000..473c490c
Binary files /dev/null and b/documentation/current/eiffelstudio/_images/toolbar-options-dropdown.png differ
diff --git a/documentation/current/eiffelstudio/_images/toolbar-options-dropdown.png.data b/documentation/current/eiffelstudio/_images/toolbar-options-dropdown.png.data
new file mode 100644
index 00000000..94c6aa2f
--- /dev/null
+++ b/documentation/current/eiffelstudio/_images/toolbar-options-dropdown.png.data
@@ -0,0 +1,3 @@
+title=toolbar-options-dropdown
+author=halw
+path=content/toolbar-options-dropdown
diff --git a/documentation/current/eiffelstudio/eiffelstudio-reference/eiffelstudio-general-interface-description/eiffelstudio-interface-mechanisms/toolbar-customization.wiki b/documentation/current/eiffelstudio/eiffelstudio-reference/eiffelstudio-general-interface-description/eiffelstudio-interface-mechanisms/toolbar-customization.wiki
index 24bcebcc..192ad100 100644
--- a/documentation/current/eiffelstudio/eiffelstudio-reference/eiffelstudio-general-interface-description/eiffelstudio-interface-mechanisms/toolbar-customization.wiki
+++ b/documentation/current/eiffelstudio/eiffelstudio-reference/eiffelstudio-general-interface-description/eiffelstudio-interface-mechanisms/toolbar-customization.wiki
@@ -1,16 +1,27 @@
 [[Property:title|Toolbar customization]]
 [[Property:weight|2]]
 [[Property:uuid|f02205ad-2d3e-a9f1-d104-ca96e1fd2d77]]
-{{UpdateNeeded}}
+It is possible to choose which icons appear in the EiffelStudio [[Main toolbars|toolbars]]. 
+
+If you right-click on any toolbar you will see a context menu that allows you to choose which toolbars are visible and to customize the visible icons for  each:
 
 
-It is possible to choose which icons appear in the [[Main toolbars|standard toolbar]]  and in the [[Main toolbars|project toolbar]] . To customize the standard toolbar, select '''Customize standard toolbar...''' in the '''Toolbars''' sub-menu of the '''View''' menu. To customize the project toolbar, select '''Customize project toolbar...''' in the same sub-menu. 
-In both cases, a toolbar customization window will appear. Two lists of icons are displayed in the window. The list on the right shows the icons that are in the toolbar. The list on the left gathers the icons that are currently not in the toolbar and that may be added. It also contains a separator that may be used to organize icons.
+[[Image:toolbar-context-menu]]
+
+
+You can also choose to customize a toolbar by clicking on the '''Toolbar Options''' drop-down menu at the right end of the toolbar, and select '''Customize''': 
+
+
+[[Image:toolbar-options-dropdown]]
 
 
 
-<center> [[Image:toolbar-customization-dialog]]  <br/>
-</center>
+Whenever you choose to customize a toolbar, two lists of icons are displayed in the '''Customize Toolbar''' dialog window. The list on the right shows the icons that are currently displayed in the toolbar. The list on the left gathers the icons that are currently not in the toolbar and that may be added. It also contains a separator that may be used to organize icons. In the figure below, you see the Customize Toolbar dialog targeted to the project toolbar.
+
+
+[[Image:Customize toolbar dialog]]
+
+
 
 To add an icon or a separator to the toolbar, select it in the left list and click on the '''Add ->''' button. It will then be inserted in the right list after the selected item. <br/>
 To remove an icon, click on it in the right list and click on '''<- Remove'''. 
@@ -21,11 +32,10 @@ The order of the icons in the right list is the same as in the toolbar. If you w
 
 Lastly, some icons can be displayed with an explanatory text. A menu at the bottom of the window will allow you to choose if the text should be displayed. The tables below present the list of these icons for both toolbars and what they look like with and without text.
 
-Once you made the changes you wanted, validate them by clicking on '''OK'''. You can also go back to the initial toolbar layout by clicking on '''C ancel'''. 
+Once you made the changes you wanted, validate them by clicking on '''OK'''. You can also go back to the initial toolbar layout by clicking on '''Cancel'''. 
 
 {{seealso|<br/>
 [[Main toolbars|Toolbars Reference]]  }}
 
 
 
-