diff --git a/documentation/current/eiffelstudio/eiffelstudio-how-tos/designing-project/altering-system/refactoring/index.wiki b/documentation/current/eiffelstudio/eiffelstudio-how-tos/designing-project/altering-system/refactoring/index.wiki
index 01a39b5e..58beee63 100644
--- a/documentation/current/eiffelstudio/eiffelstudio-how-tos/designing-project/altering-system/refactoring/index.wiki
+++ b/documentation/current/eiffelstudio/eiffelstudio-how-tos/designing-project/altering-system/refactoring/index.wiki
@@ -3,7 +3,7 @@
 [[Property:uuid|08099f7b-aaf4-b629-17f6-b637c4efd63a]]
 Refactoring actions include renaming classes and features, and relocating features to an ancestor class. Refactoring actions start with a compilation and also end with a compilation. Refactoring has a separate undo functionality which allows you to undo a refactoring action as long as no changes have been made to the classes that have been refactored. 
 
-The [[Main toolbars|Refactoring toolbar]] contains button-holes for both the "rename" and "pull up" refactoring actions. So, if the Refactoring toolbar is visible, you can "pick" a feature, for example, and drop it onto one of the refactoring button-holes. If the Refactoring toolbar is not visible, you can [[Main toolbars|make it visible]] or you can access refactoring actions through the context menu associated with a class or feature name (right-click to see the context menu, or shift-right-click if you are in "pick-and-drop" mode). 
+The [[Main toolbars|Refactoring toolbar]] contains holes for both the "rename" ([[Image:refactor-rename-icon]]) and "pull up" ([[Image:refactor-feature-up-icon]]) refactoring actions. So, if the Refactoring toolbar is visible, you can "pick" a feature, for example, and drop it onto one of the refactoring holes. If the Refactoring toolbar is not visible, you can [[Main toolbars|make it visible]] or you can access refactoring actions through the context menu associated with a class or feature name (right-click to see the context menu, or shift-right-click if you are in "pick-and-drop by default" mode). 
 
 
 
diff --git a/documentation/current/eiffelstudio/eiffelstudio-how-tos/designing-project/altering-system/refactoring/rename-class.wiki b/documentation/current/eiffelstudio/eiffelstudio-how-tos/designing-project/altering-system/refactoring/rename-class.wiki
index 8f65e331..5cc78c76 100644
--- a/documentation/current/eiffelstudio/eiffelstudio-how-tos/designing-project/altering-system/refactoring/rename-class.wiki
+++ b/documentation/current/eiffelstudio/eiffelstudio-how-tos/designing-project/altering-system/refactoring/rename-class.wiki
@@ -2,17 +2,15 @@
 [[Property:link_title|Rename Class]]
 [[Property:weight|3]]
 [[Property:uuid|e70f2760-389a-4c54-ed10-b731dc70e952]]
-# Start pick-and-drop on the class bubble of which you want to change the name.
-# Drop it in the '''Rename Feature/Class''' hole.  [[Image:refactor-rename-icon]]  
+# Start the '''Rename''' refactoring action by either:
+## Selecting '''Refactoring->Rename''' from the context menu associated with the class you want to rename.
+## Picking the class and drop it into the Rename hole ([[Image:refactor-rename-icon]]) on the [[Main toolbars|refactoring toolbar]].
 # After a compilation the '''Refactoring: Class Rename''' dialog appears. You can enter a new name. 
-
-
 # You can choose between these options: 
 #*  '''Compiled Classes''': only to the refactoring in compiled classes. 
 #*  '''All Classes''': do the refactoring in all classes, even in uncompiled classes. 
 #*  '''Rename File''': rename the file of the class to correspond with the class name, if another file with this name already exists the file will not be renamed and a warning will be given. 
 #*  '''Replace Name in Comments''': replace usage of the class name in comments that follow the '''{CLASSNAME}''' syntax. 
 #*  '''Replace Name in Strings''': replace usage of the class name in strings that follow the '''{CLASSNAME}''' syntax. 
-
 # Click '''OK'''.