359057: [Architecture - SVN - Build] The Papyrus architecture should be refactored

https://bugs.eclipse.org/bugs/show_bug.cgi?id=359057

308 files changed, 0 insertions, 0 deletions

diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/.classpath b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/.classpath
index 2d1a4302f04..2d1a4302f04 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/.classpath
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/.classpath
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/.project b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/.project
index 6be54876d9a..6be54876d9a 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/.project
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/.project
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/.settings/org.eclipse.jdt.core.prefs b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/.settings/org.eclipse.jdt.core.prefs
index 280b58262e3..280b58262e3 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/.settings/org.eclipse.jdt.core.prefs
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/META-INF/MANIFEST.MF
index a4e9360ba7f..a4e9360ba7f 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/META-INF/MANIFEST.MF
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/about.html b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/about.html
index 82d49bf5f81..82d49bf5f81 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/about.html
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/about.html
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/build.properties b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/build.properties
index 9aea81f43c1..9aea81f43c1 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/build.properties
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/build.properties
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/plugin.properties b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/plugin.properties
index c207ae4d2ef..c207ae4d2ef 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/plugin.properties
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/plugin.properties
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/Abstraction.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/Abstraction.gif
index d01b567dded..d01b567dded 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/Abstraction.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/Abstraction.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/AcceptCallAction.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/AcceptCallAction.gif
index bdf16fe1db4..bdf16fe1db4 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/AcceptCallAction.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/AcceptCallAction.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/AcceptEventAction.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/AcceptEventAction.gif
index 0eb6ab8ef71..0eb6ab8ef71 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/AcceptEventAction.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/AcceptEventAction.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/ActionExecutionSpecification.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/ActionExecutionSpecification.gif
index e46fc5171bc..e46fc5171bc 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/ActionExecutionSpecification.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/ActionExecutionSpecification.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/ActionInputPin.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/ActionInputPin.gif
index 64043674e6d..64043674e6d 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/ActionInputPin.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/ActionInputPin.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/Activity.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/Activity.gif
index 7d019de7662..7d019de7662 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/Activity.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/Activity.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/ActivityFinalNode.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/ActivityFinalNode.gif
index 083afef869f..083afef869f 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/ActivityFinalNode.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/ActivityFinalNode.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/ActivityParameterNode.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/ActivityParameterNode.gif
index 0073726a361..0073726a361 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/ActivityParameterNode.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/ActivityParameterNode.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/ActivityPartition.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/ActivityPartition.gif
index 0985ca8e8ae..0985ca8e8ae 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/ActivityPartition.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/ActivityPartition.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/Actor.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/Actor.gif
index 09a2a292b22..09a2a292b22 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/Actor.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/Actor.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/AddStructuralFeatureValueAction.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/AddStructuralFeatureValueAction.gif
index afe6872929e..afe6872929e 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/AddStructuralFeatureValueAction.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/AddStructuralFeatureValueAction.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/AddVariableValueAction.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/AddVariableValueAction.gif
index 7cc6624a215..7cc6624a215 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/AddVariableValueAction.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/AddVariableValueAction.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/AnyReceiveEvent.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/AnyReceiveEvent.gif
index 521ea7d5f56..521ea7d5f56 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/AnyReceiveEvent.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/AnyReceiveEvent.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/Artifact.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/Artifact.gif
index 37cb7f007d9..37cb7f007d9 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/Artifact.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/Artifact.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/Association.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/Association.gif
index cebaea7917b..cebaea7917b 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/Association.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/Association.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/AssociationClass.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/AssociationClass.gif
index ec949e98e5c..ec949e98e5c 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/AssociationClass.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/AssociationClass.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/Association_composite.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/Association_composite.gif
index 671930947ef..671930947ef 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/Association_composite.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/Association_composite.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/Association_none.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/Association_none.gif
index feb7d2738fc..feb7d2738fc 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/Association_none.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/Association_none.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/Association_shared.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/Association_shared.gif
index d117db8a95a..d117db8a95a 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/Association_shared.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/Association_shared.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/BehaviorExecutionSpecification.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/BehaviorExecutionSpecification.gif
index d1e6005b4b1..d1e6005b4b1 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/BehaviorExecutionSpecification.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/BehaviorExecutionSpecification.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/BroadcastSignalAction.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/BroadcastSignalAction.gif
index 0fbda5a5f04..0fbda5a5f04 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/BroadcastSignalAction.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/BroadcastSignalAction.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/CallBehaviorAction.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/CallBehaviorAction.gif
index cb2f04f8b07..cb2f04f8b07 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/CallBehaviorAction.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/CallBehaviorAction.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/CallEvent.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/CallEvent.gif
index d43c8b6b8de..d43c8b6b8de 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/CallEvent.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/CallEvent.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/CallOperationAction.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/CallOperationAction.gif
index 1ba8911d918..1ba8911d918 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/CallOperationAction.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/CallOperationAction.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/CentralBufferNode.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/CentralBufferNode.gif
index e6f251cb78c..e6f251cb78c 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/CentralBufferNode.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/CentralBufferNode.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/ChangeEvent.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/ChangeEvent.gif
index fcb6a15d973..fcb6a15d973 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/ChangeEvent.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/ChangeEvent.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/Class.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/Class.gif
index 253ff626f6c..253ff626f6c 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/Class.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/Class.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/ClassifierTemplateParameter.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/ClassifierTemplateParameter.gif
index a5ff6e1e6cd..a5ff6e1e6cd 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/ClassifierTemplateParameter.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/ClassifierTemplateParameter.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/Clause.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/Clause.gif
index 8ef34721c58..8ef34721c58 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/Clause.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/Clause.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/ClearAssociationAction.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/ClearAssociationAction.gif
index 141e7804983..141e7804983 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/ClearAssociationAction.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/ClearAssociationAction.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/ClearStructuralFeatureAction.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/ClearStructuralFeatureAction.gif
index 42605bd4f0c..42605bd4f0c 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/ClearStructuralFeatureAction.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/ClearStructuralFeatureAction.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/ClearVariableAction.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/ClearVariableAction.gif
index 7750007bc95..7750007bc95 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/ClearVariableAction.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/ClearVariableAction.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/Collaboration.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/Collaboration.gif
index c07265c144f..c07265c144f 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/Collaboration.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/Collaboration.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/CollaborationUse.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/CollaborationUse.gif
index f03a267cd20..f03a267cd20 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/CollaborationUse.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/CollaborationUse.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/CombinedFragment.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/CombinedFragment.gif
index e835edb9dea..e835edb9dea 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/CombinedFragment.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/CombinedFragment.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/Comment.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/Comment.gif
index e410c708ba1..e410c708ba1 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/Comment.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/Comment.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/CommunicationPath.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/CommunicationPath.gif
index 7a849eb47ac..7a849eb47ac 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/CommunicationPath.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/CommunicationPath.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/Component.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/Component.gif
index 7fd8b5e02c2..7fd8b5e02c2 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/Component.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/Component.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/ComponentRealization.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/ComponentRealization.gif
index fff050f66ae..fff050f66ae 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/ComponentRealization.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/ComponentRealization.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/ConditionalNode.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/ConditionalNode.gif
index 1cbb501d8a3..1cbb501d8a3 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/ConditionalNode.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/ConditionalNode.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/ConnectableElementTemplateParameter.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/ConnectableElementTemplateParameter.gif
index 2663fee57b8..2663fee57b8 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/ConnectableElementTemplateParameter.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/ConnectableElementTemplateParameter.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/ConnectionPointReference.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/ConnectionPointReference.gif
index 939ace492cd..939ace492cd 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/ConnectionPointReference.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/ConnectionPointReference.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/Connector.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/Connector.gif
index df47b3a60bf..df47b3a60bf 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/Connector.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/Connector.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/ConnectorEnd.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/ConnectorEnd.gif
index 7da4aba1b11..7da4aba1b11 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/ConnectorEnd.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/ConnectorEnd.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/Connector_assembly.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/Connector_assembly.gif
index b1a09d337da..b1a09d337da 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/Connector_assembly.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/Connector_assembly.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/Connector_delegation.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/Connector_delegation.gif
index 5f9a0d85617..5f9a0d85617 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/Connector_delegation.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/Connector_delegation.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/ConsiderIgnoreFragment.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/ConsiderIgnoreFragment.gif
index 1bad086cdd4..1bad086cdd4 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/ConsiderIgnoreFragment.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/ConsiderIgnoreFragment.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/Constraint.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/Constraint.gif
index 65afa8e62ed..65afa8e62ed 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/Constraint.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/Constraint.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/Continuation.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/Continuation.gif
index 258c98f409a..258c98f409a 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/Continuation.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/Continuation.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/ControlFlow.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/ControlFlow.gif
index 4fe52486fb2..4fe52486fb2 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/ControlFlow.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/ControlFlow.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/CreateLinkAction.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/CreateLinkAction.gif
index 5c40ac5e433..5c40ac5e433 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/CreateLinkAction.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/CreateLinkAction.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/CreateLinkObjectAction.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/CreateLinkObjectAction.gif
index dba00b0aeea..dba00b0aeea 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/CreateLinkObjectAction.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/CreateLinkObjectAction.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/CreateObjectAction.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/CreateObjectAction.gif
index 3842f57e6c6..3842f57e6c6 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/CreateObjectAction.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/CreateObjectAction.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/CreationEvent.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/CreationEvent.gif
index b399298dda6..b399298dda6 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/CreationEvent.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/CreationEvent.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/DataStoreNode.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/DataStoreNode.gif
index ea317cd3dcc..ea317cd3dcc 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/DataStoreNode.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/DataStoreNode.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/DataType.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/DataType.gif
index 2778f494cda..2778f494cda 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/DataType.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/DataType.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/DecisionNode.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/DecisionNode.gif
index 01c5ce673a1..01c5ce673a1 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/DecisionNode.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/DecisionNode.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/Dependency.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/Dependency.gif
index db7c6dd6b3a..db7c6dd6b3a 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/Dependency.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/Dependency.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/Deployment.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/Deployment.gif
index 91745cc5bbe..91745cc5bbe 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/Deployment.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/Deployment.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/DeploymentSpecification.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/DeploymentSpecification.gif
index af579f8792b..af579f8792b 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/DeploymentSpecification.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/DeploymentSpecification.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/DestroyLinkAction.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/DestroyLinkAction.gif
index e904edd0ef9..e904edd0ef9 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/DestroyLinkAction.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/DestroyLinkAction.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/DestroyObjectAction.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/DestroyObjectAction.gif
index fbc01b857c9..fbc01b857c9 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/DestroyObjectAction.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/DestroyObjectAction.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/DestructionEvent.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/DestructionEvent.gif
index 8de1a6933ca..8de1a6933ca 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/DestructionEvent.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/DestructionEvent.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/Device.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/Device.gif
index 7ea807061b5..7ea807061b5 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/Device.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/Device.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/Duration.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/Duration.gif
index ab7361e48fc..ab7361e48fc 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/Duration.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/Duration.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/DurationConstraint.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/DurationConstraint.gif
index 14b4a03f3a5..14b4a03f3a5 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/DurationConstraint.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/DurationConstraint.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/DurationInterval.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/DurationInterval.gif
index 972dd0c3904..972dd0c3904 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/DurationInterval.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/DurationInterval.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/DurationObservation.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/DurationObservation.gif
index ec9155c90c8..ec9155c90c8 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/DurationObservation.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/DurationObservation.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/ElementImport.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/ElementImport.gif
index 430b0c133ec..430b0c133ec 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/ElementImport.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/ElementImport.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/Enumeration.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/Enumeration.gif
index 0613ce01923..0613ce01923 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/Enumeration.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/Enumeration.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/EnumerationLiteral.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/EnumerationLiteral.gif
index f0a62bc3c02..f0a62bc3c02 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/EnumerationLiteral.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/EnumerationLiteral.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/ExceptionHandler.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/ExceptionHandler.gif
index 4d942404416..4d942404416 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/ExceptionHandler.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/ExceptionHandler.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/ExecutionEnvironment.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/ExecutionEnvironment.gif
index e8546850a44..e8546850a44 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/ExecutionEnvironment.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/ExecutionEnvironment.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/ExecutionEvent.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/ExecutionEvent.gif
index 7001ee7ceb1..7001ee7ceb1 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/ExecutionEvent.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/ExecutionEvent.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/ExecutionOccurrenceSpecification.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/ExecutionOccurrenceSpecification.gif
index cfe882cf2cb..cfe882cf2cb 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/ExecutionOccurrenceSpecification.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/ExecutionOccurrenceSpecification.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/ExpansionNode.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/ExpansionNode.gif
index a5a678f7a1f..a5a678f7a1f 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/ExpansionNode.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/ExpansionNode.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/ExpansionRegion.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/ExpansionRegion.gif
index 08072f5687f..08072f5687f 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/ExpansionRegion.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/ExpansionRegion.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/Expression.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/Expression.gif
index 13efea3939d..13efea3939d 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/Expression.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/Expression.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/Extend.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/Extend.gif
index 8b05c196578..8b05c196578 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/Extend.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/Extend.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/Extension.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/Extension.gif
index 4ea6245707d..4ea6245707d 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/Extension.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/Extension.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/ExtensionEnd.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/ExtensionEnd.gif
index 5c750afe7ea..5c750afe7ea 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/ExtensionEnd.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/ExtensionEnd.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/ExtensionPoint.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/ExtensionPoint.gif
index f7807512aec..f7807512aec 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/ExtensionPoint.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/ExtensionPoint.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/FinalState.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/FinalState.gif
index 2d0f535edd0..2d0f535edd0 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/FinalState.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/FinalState.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/FlowFinalNode.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/FlowFinalNode.gif
index 60cfbe41cce..60cfbe41cce 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/FlowFinalNode.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/FlowFinalNode.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/ForkNode.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/ForkNode.gif
index 415acec953a..415acec953a 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/ForkNode.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/ForkNode.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/FunctionBehavior.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/FunctionBehavior.gif
index acaf29a33ce..acaf29a33ce 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/FunctionBehavior.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/FunctionBehavior.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/Gate.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/Gate.gif
index d581a7a0140..d581a7a0140 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/Gate.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/Gate.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/GeneralOrdering.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/GeneralOrdering.gif
index 885d1536025..885d1536025 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/GeneralOrdering.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/GeneralOrdering.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/Generalization.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/Generalization.gif
index 71dc26f6a7e..71dc26f6a7e 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/Generalization.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/Generalization.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/GeneralizationSet.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/GeneralizationSet.gif
index 08d0ebc4feb..08d0ebc4feb 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/GeneralizationSet.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/GeneralizationSet.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/Image.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/Image.gif
index 0e096e398d4..0e096e398d4 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/Image.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/Image.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/Include.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/Include.gif
index 6a51165daa9..6a51165daa9 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/Include.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/Include.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/InformationFlow.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/InformationFlow.gif
index c1ae321d218..c1ae321d218 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/InformationFlow.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/InformationFlow.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/InformationItem.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/InformationItem.gif
index 1a51486630e..1a51486630e 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/InformationItem.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/InformationItem.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/InitialNode.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/InitialNode.gif
index aebab150f11..aebab150f11 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/InitialNode.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/InitialNode.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/InputPin.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/InputPin.gif
index e03d0b57094..e03d0b57094 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/InputPin.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/InputPin.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/InstanceSpecification.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/InstanceSpecification.gif
index 6c33e1dd175..6c33e1dd175 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/InstanceSpecification.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/InstanceSpecification.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/InstanceValue.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/InstanceValue.gif
index 358b3104b2b..358b3104b2b 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/InstanceValue.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/InstanceValue.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/Interaction.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/Interaction.gif
index f5075f09913..f5075f09913 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/Interaction.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/Interaction.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/InteractionConstraint.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/InteractionConstraint.gif
index 7623dff32fc..7623dff32fc 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/InteractionConstraint.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/InteractionConstraint.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/InteractionOperand.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/InteractionOperand.gif
index ec0710ad2fb..ec0710ad2fb 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/InteractionOperand.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/InteractionOperand.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/InteractionUse.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/InteractionUse.gif
index a89e6f30801..a89e6f30801 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/InteractionUse.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/InteractionUse.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/Interface.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/Interface.gif
index 280f7675ba3..280f7675ba3 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/Interface.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/Interface.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/InterfaceRealization.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/InterfaceRealization.gif
index 4a69360e291..4a69360e291 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/InterfaceRealization.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/InterfaceRealization.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/InterruptibleActivityRegion.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/InterruptibleActivityRegion.gif
index 6440a14673c..6440a14673c 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/InterruptibleActivityRegion.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/InterruptibleActivityRegion.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/Interval.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/Interval.gif
index 8193771c073..8193771c073 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/Interval.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/Interval.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/IntervalConstraint.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/IntervalConstraint.gif
index e757bd8cccc..e757bd8cccc 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/IntervalConstraint.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/IntervalConstraint.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/JoinNode.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/JoinNode.gif
index 6680f1930fa..6680f1930fa 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/JoinNode.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/JoinNode.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/Lifeline.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/Lifeline.gif
index 099e66f28df..099e66f28df 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/Lifeline.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/Lifeline.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/LinkEndCreationData.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/LinkEndCreationData.gif
index 7171cc9ad5c..7171cc9ad5c 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/LinkEndCreationData.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/LinkEndCreationData.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/LinkEndData.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/LinkEndData.gif
index e81806c30f5..e81806c30f5 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/LinkEndData.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/LinkEndData.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/LinkEndDestructionData.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/LinkEndDestructionData.gif
index e310889a84a..e310889a84a 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/LinkEndDestructionData.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/LinkEndDestructionData.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/LiteralBoolean.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/LiteralBoolean.gif
index 1e39564dd64..1e39564dd64 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/LiteralBoolean.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/LiteralBoolean.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/LiteralInteger.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/LiteralInteger.gif
index 3fcc8c4b352..3fcc8c4b352 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/LiteralInteger.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/LiteralInteger.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/LiteralNull.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/LiteralNull.gif
index 75fa3e1736c..75fa3e1736c 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/LiteralNull.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/LiteralNull.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/LiteralString.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/LiteralString.gif
index e0191eef9ee..e0191eef9ee 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/LiteralString.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/LiteralString.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/LiteralUnlimitedNatural.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/LiteralUnlimitedNatural.gif
index 537bb5bd333..537bb5bd333 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/LiteralUnlimitedNatural.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/LiteralUnlimitedNatural.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/LoopNode.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/LoopNode.gif
index 0676ccf094e..0676ccf094e 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/LoopNode.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/LoopNode.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/Manifestation.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/Manifestation.gif
index 6ef8aa79714..6ef8aa79714 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/Manifestation.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/Manifestation.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/MergeNode.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/MergeNode.gif
index 5af89ca708e..5af89ca708e 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/MergeNode.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/MergeNode.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/Message.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/Message.gif
index 562971c639a..562971c639a 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/Message.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/Message.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/MessageOccurrenceSpecification.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/MessageOccurrenceSpecification.gif
index 87581b85f77..87581b85f77 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/MessageOccurrenceSpecification.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/MessageOccurrenceSpecification.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/Message_asynchCall.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/Message_asynchCall.gif
index ee64a9fce8c..ee64a9fce8c 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/Message_asynchCall.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/Message_asynchCall.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/Message_asynchSignal.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/Message_asynchSignal.gif
index f111994cb85..f111994cb85 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/Message_asynchSignal.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/Message_asynchSignal.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/Message_createMessage.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/Message_createMessage.gif
index 18021fb93de..18021fb93de 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/Message_createMessage.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/Message_createMessage.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/Message_deleteMessage.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/Message_deleteMessage.gif
index 72171f1973f..72171f1973f 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/Message_deleteMessage.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/Message_deleteMessage.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/Message_reply.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/Message_reply.gif
index a88506f217e..a88506f217e 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/Message_reply.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/Message_reply.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/Message_synchCall.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/Message_synchCall.gif
index 359796de05f..359796de05f 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/Message_synchCall.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/Message_synchCall.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/Model.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/Model.gif
index c233c27ebd6..c233c27ebd6 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/Model.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/Model.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/Node.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/Node.gif
index 81a9df6c1f6..81a9df6c1f6 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/Node.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/Node.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/ObjectFlow.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/ObjectFlow.gif
index 2b7d7f893fa..2b7d7f893fa 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/ObjectFlow.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/ObjectFlow.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/OccurrenceSpecification.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/OccurrenceSpecification.gif
index b6151c37707..b6151c37707 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/OccurrenceSpecification.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/OccurrenceSpecification.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/OpaqueAction.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/OpaqueAction.gif
index 70d132fdcfd..70d132fdcfd 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/OpaqueAction.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/OpaqueAction.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/OpaqueBehavior.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/OpaqueBehavior.gif
index cffa8560e03..cffa8560e03 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/OpaqueBehavior.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/OpaqueBehavior.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/OpaqueExpression.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/OpaqueExpression.gif
index 35ef83cb339..35ef83cb339 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/OpaqueExpression.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/OpaqueExpression.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/Operation.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/Operation.gif
index dfb60d981dc..dfb60d981dc 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/Operation.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/Operation.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/OperationTemplateParameter.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/OperationTemplateParameter.gif
index 11a34feff6b..11a34feff6b 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/OperationTemplateParameter.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/OperationTemplateParameter.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/OutputPin.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/OutputPin.gif
index 063151f3167..063151f3167 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/OutputPin.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/OutputPin.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/Package.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/Package.gif
index 728e46a69ee..728e46a69ee 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/Package.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/Package.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/PackageImport.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/PackageImport.gif
index e3b8a62dfd1..e3b8a62dfd1 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/PackageImport.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/PackageImport.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/PackageMerge.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/PackageMerge.gif
index 82b022fa7c2..82b022fa7c2 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/PackageMerge.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/PackageMerge.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/Parameter.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/Parameter.gif
index 39ba0d51598..39ba0d51598 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/Parameter.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/Parameter.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/ParameterSet.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/ParameterSet.gif
index f9301c47f0d..f9301c47f0d 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/ParameterSet.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/ParameterSet.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/Parameter_in.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/Parameter_in.gif
index 911cbeb878f..911cbeb878f 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/Parameter_in.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/Parameter_in.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/Parameter_inout.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/Parameter_inout.gif
index 3a0e6f3f9a0..3a0e6f3f9a0 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/Parameter_inout.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/Parameter_inout.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/Parameter_out.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/Parameter_out.gif
index e80c5fae2c5..e80c5fae2c5 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/Parameter_out.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/Parameter_out.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/Parameter_return.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/Parameter_return.gif
index 65fdd7a1a86..65fdd7a1a86 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/Parameter_return.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/Parameter_return.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/PartDecomposition.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/PartDecomposition.gif
index 93d3ae6e6d0..93d3ae6e6d0 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/PartDecomposition.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/PartDecomposition.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/Pin.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/Pin.gif
index 90fbc52f356..90fbc52f356 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/Pin.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/Pin.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/Port.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/Port.gif
index ffc01baada7..ffc01baada7 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/Port.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/Port.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/PrimitiveType.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/PrimitiveType.gif
index aed79cdc2e9..aed79cdc2e9 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/PrimitiveType.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/PrimitiveType.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/Profile.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/Profile.gif
index 0e554699f8c..0e554699f8c 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/Profile.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/Profile.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/ProfileApplication.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/ProfileApplication.gif
index 217115de6ee..217115de6ee 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/ProfileApplication.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/ProfileApplication.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/Property.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/Property.gif
index 87d635f3c66..87d635f3c66 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/Property.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/Property.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/ProtocolConformance.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/ProtocolConformance.gif
index e4aa826d782..e4aa826d782 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/ProtocolConformance.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/ProtocolConformance.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/ProtocolStateMachine.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/ProtocolStateMachine.gif
index 0a4834d6fc8..0a4834d6fc8 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/ProtocolStateMachine.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/ProtocolStateMachine.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/ProtocolTransition.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/ProtocolTransition.gif
index 09bbe6f5c91..09bbe6f5c91 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/ProtocolTransition.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/ProtocolTransition.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/Pseudostate.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/Pseudostate.gif
index f743367b7dd..f743367b7dd 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/Pseudostate.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/Pseudostate.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/Pseudostate_choice.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/Pseudostate_choice.gif
index b5e8004681a..b5e8004681a 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/Pseudostate_choice.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/Pseudostate_choice.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/Pseudostate_deepHistory.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/Pseudostate_deepHistory.gif
index 3625384b329..3625384b329 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/Pseudostate_deepHistory.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/Pseudostate_deepHistory.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/Pseudostate_entryPoint.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/Pseudostate_entryPoint.gif
index 2dadfae8f62..2dadfae8f62 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/Pseudostate_entryPoint.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/Pseudostate_entryPoint.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/Pseudostate_exitPoint.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/Pseudostate_exitPoint.gif
index 3392389f2e2..3392389f2e2 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/Pseudostate_exitPoint.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/Pseudostate_exitPoint.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/Pseudostate_fork.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/Pseudostate_fork.gif
index 971a5aa2293..971a5aa2293 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/Pseudostate_fork.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/Pseudostate_fork.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/Pseudostate_initial.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/Pseudostate_initial.gif
index 66ea8bfa1d8..66ea8bfa1d8 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/Pseudostate_initial.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/Pseudostate_initial.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/Pseudostate_join.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/Pseudostate_join.gif
index 79e44109668..79e44109668 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/Pseudostate_join.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/Pseudostate_join.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/Pseudostate_junction.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/Pseudostate_junction.gif
index b3e1a1d5e09..b3e1a1d5e09 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/Pseudostate_junction.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/Pseudostate_junction.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/Pseudostate_shallowHistory.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/Pseudostate_shallowHistory.gif
index 8b101c4be8a..8b101c4be8a 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/Pseudostate_shallowHistory.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/Pseudostate_shallowHistory.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/Pseudostate_terminate.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/Pseudostate_terminate.gif
index ea6fb9b0132..ea6fb9b0132 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/Pseudostate_terminate.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/Pseudostate_terminate.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/QualifierValue.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/QualifierValue.gif
index 752929a5ac9..752929a5ac9 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/QualifierValue.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/QualifierValue.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/RaiseExceptionAction.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/RaiseExceptionAction.gif
index a5220171902..a5220171902 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/RaiseExceptionAction.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/RaiseExceptionAction.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/ReadExtentAction.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/ReadExtentAction.gif
index 804dc35b761..804dc35b761 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/ReadExtentAction.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/ReadExtentAction.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/ReadIsClassifiedObjectAction.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/ReadIsClassifiedObjectAction.gif
index 4dbf9bd1048..4dbf9bd1048 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/ReadIsClassifiedObjectAction.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/ReadIsClassifiedObjectAction.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/ReadLinkAction.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/ReadLinkAction.gif
index 29fe5c667bf..29fe5c667bf 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/ReadLinkAction.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/ReadLinkAction.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/ReadLinkObjectEndAction.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/ReadLinkObjectEndAction.gif
index 38d57a1707a..38d57a1707a 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/ReadLinkObjectEndAction.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/ReadLinkObjectEndAction.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/ReadLinkObjectEndQualifierAction.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/ReadLinkObjectEndQualifierAction.gif
index 33b8a77e36a..33b8a77e36a 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/ReadLinkObjectEndQualifierAction.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/ReadLinkObjectEndQualifierAction.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/ReadSelfAction.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/ReadSelfAction.gif
index d2ef012d97a..d2ef012d97a 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/ReadSelfAction.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/ReadSelfAction.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/ReadStructuralFeatureAction.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/ReadStructuralFeatureAction.gif
index 34534fb343f..34534fb343f 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/ReadStructuralFeatureAction.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/ReadStructuralFeatureAction.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/ReadVariableAction.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/ReadVariableAction.gif
index 67d98304f73..67d98304f73 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/ReadVariableAction.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/ReadVariableAction.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/Realization.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/Realization.gif
index 322777ee0a2..322777ee0a2 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/Realization.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/Realization.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/ReceiveOperationEvent.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/ReceiveOperationEvent.gif
index 427316c2530..427316c2530 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/ReceiveOperationEvent.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/ReceiveOperationEvent.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/ReceiveSignalEvent.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/ReceiveSignalEvent.gif
index 1fe497fd43a..1fe497fd43a 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/ReceiveSignalEvent.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/ReceiveSignalEvent.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/Reception.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/Reception.gif
index 3931df23cca..3931df23cca 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/Reception.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/Reception.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/ReclassifyObjectAction.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/ReclassifyObjectAction.gif
index 86a2bdde0dd..86a2bdde0dd 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/ReclassifyObjectAction.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/ReclassifyObjectAction.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/RedefinableTemplateSignature.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/RedefinableTemplateSignature.gif
index 99eae0d9918..99eae0d9918 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/RedefinableTemplateSignature.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/RedefinableTemplateSignature.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/ReduceAction.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/ReduceAction.gif
index 2227d8a9895..2227d8a9895 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/ReduceAction.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/ReduceAction.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/Region.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/Region.gif
index 5f15ccc101a..5f15ccc101a 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/Region.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/Region.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/RemoveStructuralFeatureValueAction.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/RemoveStructuralFeatureValueAction.gif
index de84be1ba23..de84be1ba23 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/RemoveStructuralFeatureValueAction.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/RemoveStructuralFeatureValueAction.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/RemoveVariableValueAction.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/RemoveVariableValueAction.gif
index 06de0842f20..06de0842f20 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/RemoveVariableValueAction.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/RemoveVariableValueAction.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/ReplyAction.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/ReplyAction.gif
index dfd99a525c7..dfd99a525c7 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/ReplyAction.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/ReplyAction.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/SendObjectAction.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/SendObjectAction.gif
index 073811cc074..073811cc074 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/SendObjectAction.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/SendObjectAction.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/SendOperationEvent.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/SendOperationEvent.gif
index 8b9203a43d6..8b9203a43d6 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/SendOperationEvent.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/SendOperationEvent.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/SendSignalAction.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/SendSignalAction.gif
index 19fc192a2f6..19fc192a2f6 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/SendSignalAction.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/SendSignalAction.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/SendSignalEvent.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/SendSignalEvent.gif
index 2663d5c1fd7..2663d5c1fd7 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/SendSignalEvent.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/SendSignalEvent.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/SequenceNode.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/SequenceNode.gif
index 0a6a9ed98e9..0a6a9ed98e9 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/SequenceNode.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/SequenceNode.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/Signal.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/Signal.gif
index 27c88f94dca..27c88f94dca 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/Signal.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/Signal.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/SignalEvent.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/SignalEvent.gif
index 17af78f85e3..17af78f85e3 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/SignalEvent.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/SignalEvent.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/Slot.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/Slot.gif
index 76f20c07b21..76f20c07b21 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/Slot.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/Slot.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/StartClassifierBehaviorAction.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/StartClassifierBehaviorAction.gif
index 68fc093ab0c..68fc093ab0c 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/StartClassifierBehaviorAction.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/StartClassifierBehaviorAction.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/StartObjectBehaviorAction.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/StartObjectBehaviorAction.gif
index 8fd833bbdc4..8fd833bbdc4 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/StartObjectBehaviorAction.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/StartObjectBehaviorAction.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/State.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/State.gif
index a4dd5523b49..a4dd5523b49 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/State.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/State.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/StateInvariant.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/StateInvariant.gif
index 766937b2d88..766937b2d88 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/StateInvariant.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/StateInvariant.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/StateMachine.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/StateMachine.gif
index e255f63d71c..e255f63d71c 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/StateMachine.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/StateMachine.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/Stereotype.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/Stereotype.gif
index b7ae8706f73..b7ae8706f73 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/Stereotype.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/Stereotype.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/StringExpression.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/StringExpression.gif
index 8bf023a7894..8bf023a7894 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/StringExpression.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/StringExpression.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/StructuredActivityNode.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/StructuredActivityNode.gif
index 2e0850390c6..2e0850390c6 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/StructuredActivityNode.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/StructuredActivityNode.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/Substitution.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/Substitution.gif
index 67658a30023..67658a30023 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/Substitution.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/Substitution.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/TemplateBinding.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/TemplateBinding.gif
index 63fc759d5e6..63fc759d5e6 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/TemplateBinding.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/TemplateBinding.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/TemplateParameter.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/TemplateParameter.gif
index efb1c83389d..efb1c83389d 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/TemplateParameter.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/TemplateParameter.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/TemplateParameterSubstitution.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/TemplateParameterSubstitution.gif
index f972bebd546..f972bebd546 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/TemplateParameterSubstitution.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/TemplateParameterSubstitution.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/TemplateSignature.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/TemplateSignature.gif
index 298a718cc7c..298a718cc7c 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/TemplateSignature.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/TemplateSignature.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/TestIdentityAction.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/TestIdentityAction.gif
index 1eef543a4d6..1eef543a4d6 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/TestIdentityAction.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/TestIdentityAction.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/Thumbs.db b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/Thumbs.db
index 2c5d52e39b4..2c5d52e39b4 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/Thumbs.db
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/Thumbs.db
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/TimeConstraint.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/TimeConstraint.gif
index 2e5f9a6c276..2e5f9a6c276 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/TimeConstraint.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/TimeConstraint.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/TimeEvent.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/TimeEvent.gif
index c048b1ca28d..c048b1ca28d 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/TimeEvent.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/TimeEvent.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/TimeExpression.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/TimeExpression.gif
index 83b5d92d28d..83b5d92d28d 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/TimeExpression.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/TimeExpression.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/TimeInterval.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/TimeInterval.gif
index 3c32dbb383f..3c32dbb383f 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/TimeInterval.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/TimeInterval.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/TimeObservation.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/TimeObservation.gif
index c12c1998450..c12c1998450 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/TimeObservation.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/TimeObservation.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/Transition.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/Transition.gif
index 698f368bf6c..698f368bf6c 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/Transition.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/Transition.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/Transition_external.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/Transition_external.gif
index d550f3a237f..d550f3a237f 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/Transition_external.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/Transition_external.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/Transition_internal.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/Transition_internal.gif
index b47d2882857..b47d2882857 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/Transition_internal.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/Transition_internal.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/Transition_local.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/Transition_local.gif
index 3e5dffef5a3..3e5dffef5a3 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/Transition_local.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/Transition_local.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/Trigger.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/Trigger.gif
index c7ec529aeba..c7ec529aeba 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/Trigger.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/Trigger.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/UnmarshallAction.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/UnmarshallAction.gif
index daa8e07f90a..daa8e07f90a 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/UnmarshallAction.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/UnmarshallAction.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/Usage.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/Usage.gif
index 52a5bf1e12e..52a5bf1e12e 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/Usage.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/Usage.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/UseCase.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/UseCase.gif
index 8b2b8cd06da..8b2b8cd06da 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/UseCase.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/UseCase.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/ValuePin.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/ValuePin.gif
index 0b54d09ee05..0b54d09ee05 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/ValuePin.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/ValuePin.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/ValueSpecificationAction.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/ValueSpecificationAction.gif
index 9c1b9a81637..9c1b9a81637 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/ValueSpecificationAction.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/ValueSpecificationAction.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/Variable.gif b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/Variable.gif
index 111c2605f5a..111c2605f5a 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/gif/Variable.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/gif/Variable.gif
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/icns/Abstraction.icns b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/icns/Abstraction.icns
index f74048ee4d4..f74048ee4d4 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/icns/Abstraction.icns
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/icns/Abstraction.icns
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/icns/AcceptCallAction.icns b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/icns/AcceptCallAction.icns
index b364e8e3ac4..b364e8e3ac4 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/icns/AcceptCallAction.icns
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/icns/AcceptCallAction.icns
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/icns/AcceptEventAction.icns b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/icns/AcceptEventAction.icns
index e76fed272d8..e76fed272d8 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/icns/AcceptEventAction.icns
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/icns/AcceptEventAction.icns
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/icns/ActionExecutionSpecification.icns b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/icns/ActionExecutionSpecification.icns
index cef09e6fb8f..cef09e6fb8f 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/icns/ActionExecutionSpecification.icns
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/icns/ActionExecutionSpecification.icns
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/icns/ActionInputPin.icns b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/icns/ActionInputPin.icns
index 2223f30a662..2223f30a662 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/icns/ActionInputPin.icns
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/icns/ActionInputPin.icns
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/icns/Activity.icns b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/icns/Activity.icns
index 130602647c3..130602647c3 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/icns/Activity.icns
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/icns/Activity.icns
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/icns/ActivityFinalNode.icns b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/icns/ActivityFinalNode.icns
index 666186634d8..666186634d8 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/icns/ActivityFinalNode.icns
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/icns/ActivityFinalNode.icns
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/icns/ActivityParameterNode.icns b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/icns/ActivityParameterNode.icns
index 54ac7efa6c6..54ac7efa6c6 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/icns/ActivityParameterNode.icns
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/icns/ActivityParameterNode.icns
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/icns/ActivityPartition.icns b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/icns/ActivityPartition.icns
index 3f5e1556c47..3f5e1556c47 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/icns/ActivityPartition.icns
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/icns/ActivityPartition.icns
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/icns/Actor.icns b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/icns/Actor.icns
index f1112660a67..f1112660a67 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/icns/Actor.icns
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/icns/Actor.icns
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/icns/AddStructuralFeatureValueAction.icns b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/icns/AddStructuralFeatureValueAction.icns
index dcf7441ffd1..dcf7441ffd1 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/icns/AddStructuralFeatureValueAction.icns
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/icns/AddStructuralFeatureValueAction.icns
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/icns/AddVariableValueAction.icns b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/icns/AddVariableValueAction.icns
index a89a8c38ca4..a89a8c38ca4 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/icns/AddVariableValueAction.icns
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/icns/AddVariableValueAction.icns
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/icns/AnyReceiveEvent.icns b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/icns/AnyReceiveEvent.icns
index 16676083692..16676083692 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/icns/AnyReceiveEvent.icns
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/icns/AnyReceiveEvent.icns
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/icns/Artifact.icns b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/icns/Artifact.icns
index b5ad028ef86..b5ad028ef86 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/icns/Artifact.icns
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/icns/Artifact.icns
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/icns/Association.icns b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/icns/Association.icns
index 3c2ca223f7e..3c2ca223f7e 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/icns/Association.icns
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/icns/Association.icns
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/icns/AssociationClass.icns b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/icns/AssociationClass.icns
index f509eb242e6..f509eb242e6 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/icns/AssociationClass.icns
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/icns/AssociationClass.icns
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/icns/Association_composite.icns b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/icns/Association_composite.icns
index dcbb7daff91..dcbb7daff91 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/icns/Association_composite.icns
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/icns/Association_composite.icns
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/icns/Association_none.icns b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/icns/Association_none.icns
index 9fb81656b7a..9fb81656b7a 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/icns/Association_none.icns
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/icns/Association_none.icns
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/icns/Association_shared.icns b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/icns/Association_shared.icns
index 6b1042c4d64..6b1042c4d64 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/icns/Association_shared.icns
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/icns/Association_shared.icns
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/icns/BehaviorExecutionSpecification.icns b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/icns/BehaviorExecutionSpecification.icns
index 6dfe7e43082..6dfe7e43082 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/icns/BehaviorExecutionSpecification.icns
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/icns/BehaviorExecutionSpecification.icns
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/icns/BroadcastSignalAction.icns b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/icns/BroadcastSignalAction.icns
index d59ad3d4c5f..d59ad3d4c5f 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/icns/BroadcastSignalAction.icns
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/icns/BroadcastSignalAction.icns
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/icns/CallBehaviorAction.icns b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/icns/CallBehaviorAction.icns
index ac62e853a90..ac62e853a90 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/icns/CallBehaviorAction.icns
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/icns/CallBehaviorAction.icns
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/icns/CallEvent.icns b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/icns/CallEvent.icns
index a592a3ac12a..a592a3ac12a 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/icns/CallEvent.icns
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/icns/CallEvent.icns
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/icns/CallOperationAction.icns b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/icns/CallOperationAction.icns
index 727f1927228..727f1927228 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/icns/CallOperationAction.icns
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/icns/CallOperationAction.icns
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/icns/CentralBufferNode.icns b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/icns/CentralBufferNode.icns
index 80b5b3175df..80b5b3175df 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/icns/CentralBufferNode.icns
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/icns/CentralBufferNode.icns
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/icns/ChangeEvent.icns b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/icns/ChangeEvent.icns
index aeb9a44d702..aeb9a44d702 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/icns/ChangeEvent.icns
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/icns/ChangeEvent.icns
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/icns/Class.icns b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/icns/Class.icns
index ce626bec9ea..ce626bec9ea 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/icns/Class.icns
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/icns/Class.icns
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/icns/ClassifierTemplateParameter.icns b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/icns/ClassifierTemplateParameter.icns
index 9d129af1a66..9d129af1a66 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/icns/ClassifierTemplateParameter.icns
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/icns/ClassifierTemplateParameter.icns
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/icns/Clause.icns b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/icns/Clause.icns
index 361d3eb2ca3..361d3eb2ca3 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/icns/Clause.icns
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/icns/Clause.icns
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/icns/ClearAssociationAction.icns b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/icns/ClearAssociationAction.icns
index a597bd335ed..a597bd335ed 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/icns/ClearAssociationAction.icns
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/icns/ClearAssociationAction.icns
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/icns/ClearStructuralFeatureAction.icns b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/icns/ClearStructuralFeatureAction.icns
index 091daa4bc98..091daa4bc98 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/icns/ClearStructuralFeatureAction.icns
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/icns/ClearStructuralFeatureAction.icns
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/icns/ClearVariableAction.icns b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/icns/ClearVariableAction.icns
index 7266f159835..7266f159835 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/icns/ClearVariableAction.icns
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/icns/ClearVariableAction.icns
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/icns/Collaboration.icns b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/icns/Collaboration.icns
index d244fe0b2dd..d244fe0b2dd 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/icns/Collaboration.icns
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/icns/Collaboration.icns
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/icns/CollaborationUse.icns b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/icns/CollaborationUse.icns
index 923cdebfdb6..923cdebfdb6 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/icns/CollaborationUse.icns
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/icns/CollaborationUse.icns
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/icns/CombinedFragment.icns b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/icns/CombinedFragment.icns
index 1037d2b7618..1037d2b7618 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/icns/CombinedFragment.icns
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/icns/CombinedFragment.icns
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/icns/Comment.icns b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/icns/Comment.icns
index 6083b598944..6083b598944 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/icns/Comment.icns
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/icns/Comment.icns
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/icns/InformationFlow.icns b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/icns/InformationFlow.icns
index 016a906772a..016a906772a 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/icns/InformationFlow.icns
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/icns/InformationFlow.icns
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/icns/InterfaceRealization.icns b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/icns/InterfaceRealization.icns
index dcddde2408f..dcddde2408f 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/icns/InterfaceRealization.icns
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/icns/InterfaceRealization.icns
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/icns/Manifestation.icns b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/icns/Manifestation.icns
index 24ee17a36d2..24ee17a36d2 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/icns/Manifestation.icns
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/icns/Manifestation.icns
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/icns/PackageImport.icns b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/icns/PackageImport.icns
index 8d0187cc6cf..8d0187cc6cf 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/icns/PackageImport.icns
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/icns/PackageImport.icns
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/icns/PackageMerge.icns b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/icns/PackageMerge.icns
index da332157842..da332157842 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/icns/PackageMerge.icns
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/icns/PackageMerge.icns
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/icns/ProfileApplication.icns b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/icns/ProfileApplication.icns
index 996f63075ac..996f63075ac 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/icns/ProfileApplication.icns
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/icns/ProfileApplication.icns
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/icns/Realization.icns b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/icns/Realization.icns
index ccac8d86c5e..ccac8d86c5e 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/icns/Realization.icns
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/icns/Realization.icns
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/icns/ReceiveSignalEvent.icns b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/icns/ReceiveSignalEvent.icns
index ec7f6b4bcb3..ec7f6b4bcb3 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/icns/ReceiveSignalEvent.icns
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/icns/ReceiveSignalEvent.icns
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/icns/ReclassifyObjectAction.icns b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/icns/ReclassifyObjectAction.icns
index 9c0649fb45a..9c0649fb45a 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/icns/ReclassifyObjectAction.icns
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/icns/ReclassifyObjectAction.icns
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/icns/RedefinableTemplateSignature.icns b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/icns/RedefinableTemplateSignature.icns
index fe738308277..fe738308277 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/icns/RedefinableTemplateSignature.icns
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/icns/RedefinableTemplateSignature.icns
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/icns/ReduceAction.icns b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/icns/ReduceAction.icns
index 96b14541ad6..96b14541ad6 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/icns/ReduceAction.icns
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/icns/ReduceAction.icns
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/icns/RemoveStructuralFeatureValueAction.icns b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/icns/RemoveStructuralFeatureValueAction.icns
index 9530f28de71..9530f28de71 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/icns/RemoveStructuralFeatureValueAction.icns
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/icns/RemoveStructuralFeatureValueAction.icns
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/icns/RemoveVariableValueAction.icns b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/icns/RemoveVariableValueAction.icns
index 0bb22cc5755..0bb22cc5755 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/icns/RemoveVariableValueAction.icns
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/icns/RemoveVariableValueAction.icns
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/icns/SendObjectAction.icns b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/icns/SendObjectAction.icns
index 3ec92a00342..3ec92a00342 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/icns/SendObjectAction.icns
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/icns/SendObjectAction.icns
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/icns/SendSignalEvent.icns b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/icns/SendSignalEvent.icns
index b9e276a0d64..b9e276a0d64 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/icns/SendSignalEvent.icns
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/icns/SendSignalEvent.icns
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/icns/Signal.icns b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/icns/Signal.icns
index 1e8aeb27be6..1e8aeb27be6 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/icns/Signal.icns
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/icns/Signal.icns
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/icns/SignalEvent.icns b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/icns/SignalEvent.icns
index e60c646708b..e60c646708b 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/icns/SignalEvent.icns
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/icns/SignalEvent.icns
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/icns/StartObjectBehaviorAction.icns b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/icns/StartObjectBehaviorAction.icns
index 2ec910ed0bd..2ec910ed0bd 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/icns/StartObjectBehaviorAction.icns
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/icns/StartObjectBehaviorAction.icns
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/icns/Stereotype.icns b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/icns/Stereotype.icns
index 862cf9fed99..862cf9fed99 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/icns/Stereotype.icns
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/icns/Stereotype.icns
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/icns/Substitution.icns b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/icns/Substitution.icns
index 2c7f868478d..2c7f868478d 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/icns/Substitution.icns
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/icns/Substitution.icns
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/icns/TemplateBinding.icns b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/icns/TemplateBinding.icns
index b85f6b9c972..b85f6b9c972 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/icns/TemplateBinding.icns
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/icns/TemplateBinding.icns
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/icns/TemplateParameter.icns b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/icns/TemplateParameter.icns
index cc6bb3290ae..cc6bb3290ae 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/icns/TemplateParameter.icns
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/icns/TemplateParameter.icns
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/icns/TemplateParameterSubstitution.icns b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/icns/TemplateParameterSubstitution.icns
index 72ed61853ce..72ed61853ce 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/icns/TemplateParameterSubstitution.icns
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/icns/TemplateParameterSubstitution.icns
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/icns/TemplateSignature.icns b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/icns/TemplateSignature.icns
index bf4a0385be4..bf4a0385be4 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/icns/TemplateSignature.icns
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/icns/TemplateSignature.icns
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/icns/TestIdentityAction.icns b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/icns/TestIdentityAction.icns
index 351db466b72..351db466b72 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/icns/TestIdentityAction.icns
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/icns/TestIdentityAction.icns
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/icns/Transition.icns b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/icns/Transition.icns
index 4ebe3e2e75e..4ebe3e2e75e 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/icns/Transition.icns
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/icns/Transition.icns
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/icns/Transition_external.icns b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/icns/Transition_external.icns
index 14d54719983..14d54719983 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/icns/Transition_external.icns
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/icns/Transition_external.icns
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/icns/Transition_internal.icns b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/icns/Transition_internal.icns
index d61235aa8fe..d61235aa8fe 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/icns/Transition_internal.icns
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/icns/Transition_internal.icns
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/icns/Transition_local.icns b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/icns/Transition_local.icns
index 29eee3e0b4b..29eee3e0b4b 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/icns/Transition_local.icns
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/icns/Transition_local.icns
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/icns/Trigger.icns b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/icns/Trigger.icns
index 563cf847fe0..563cf847fe0 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/icns/Trigger.icns
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/icns/Trigger.icns
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/icns/UnmarshallAction.icns b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/icns/UnmarshallAction.icns
index ef2cad50651..ef2cad50651 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/icns/UnmarshallAction.icns
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/icns/UnmarshallAction.icns
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/icns/Usage.icns b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/icns/Usage.icns
index 5547f70cf4b..5547f70cf4b 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/icns/Usage.icns
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/icns/Usage.icns
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/icns/UseCase.icns b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/icns/UseCase.icns
index bc178a9b1e7..bc178a9b1e7 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/icns/UseCase.icns
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/icns/UseCase.icns
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/icns/ValuePin.icns b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/icns/ValuePin.icns
index 158f8608c74..158f8608c74 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/icns/ValuePin.icns
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/icns/ValuePin.icns
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/icns/ValueSpecificationAction.icns b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/icns/ValueSpecificationAction.icns
index 90379b4ddcf..90379b4ddcf 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/icns/ValueSpecificationAction.icns
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/icns/ValueSpecificationAction.icns
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/icns/Variable.icns b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/icns/Variable.icns
index f30d241621a..f30d241621a 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/resource/icns/Variable.icns
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/resource/icns/Variable.icns
diff --git a/plugins/uml/org.eclipse.papyrus.icons.uml/src/org/eclipse/papyrus/icons/uml/Activator.java b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/src/org/eclipse/papyrus/icons/uml/Activator.java
index 92bfee53ec0..92bfee53ec0 100644
--- a/plugins/uml/org.eclipse.papyrus.icons.uml/src/org/eclipse/papyrus/icons/uml/Activator.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.icons.uml/src/org/eclipse/papyrus/icons/uml/Activator.java