diff --git a/plugins/architecture/org.eclipse.papyrus.sysml.architecture/icons/domain.gif b/plugins/architecture/org.eclipse.papyrus.sysml.architecture/icons/domain.gif
new file mode 100644
index 0000000..f9ff525
--- /dev/null
+++ b/plugins/architecture/org.eclipse.papyrus.sysml.architecture/icons/domain.gif
Binary files differ
diff --git a/plugins/architecture/org.eclipse.papyrus.sysml.architecture/icons/viewpoint.gif b/plugins/architecture/org.eclipse.papyrus.sysml.architecture/icons/viewpoint.gif
new file mode 100644
index 0000000..0e0fcbd
--- /dev/null
+++ b/plugins/architecture/org.eclipse.papyrus.sysml.architecture/icons/viewpoint.gif
Binary files differ
diff --git a/plugins/architecture/org.eclipse.papyrus.sysml.architecture/model/sysml.architecture b/plugins/architecture/org.eclipse.papyrus.sysml.architecture/model/sysml.architecture
index 0addd02..3349ecc 100755
--- a/plugins/architecture/org.eclipse.papyrus.sysml.architecture/model/sysml.architecture
+++ b/plugins/architecture/org.eclipse.papyrus.sysml.architecture/model/sysml.architecture
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<architecture:ArchitectureDomain xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:architecture="http://www.eclipse.org/papyrus/infra/core/architecture" xmlns:gmfdiagrepresentation="http://www.eclipse.org/papyrus/infra/gmfdiag/representation" xmlns:nattablerepresentation="http://www.eclipse.org/papyrus/infra/nattable/representation" xmi:id="_yMTQcMSdEeaKZJ_pGfaSiA" id="org.eclipse.papyrus.systemsEngineering" name="Systems Engineering" description="The domain of developing software systems">
+<architecture:ArchitectureDomain xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:architecture="http://www.eclipse.org/papyrus/infra/core/architecture" xmlns:gmfdiagrepresentation="http://www.eclipse.org/papyrus/infra/gmfdiag/representation" xmlns:nattablerepresentation="http://www.eclipse.org/papyrus/infra/nattable/representation" xmi:id="_yMTQcMSdEeaKZJ_pGfaSiA" id="org.eclipse.papyrus.systemsEngineering" name="Systems Engineering" description="The domain of developing software systems" icon="platform:/plugin/org.eclipse.papyrus.sysml.architecture/icons/domain.gif">
   <stakeholders xmi:id="_yMTQccSdEeaKZJ_pGfaSiA" id="org.eclipse.papyrus.systemsEngineering.systemsEngineer" name="Systems Engineer" description="An engineer interested in system development">
     <concerns href="#_yMTQcsSdEeaKZJ_pGfaSiA"/>
     <concerns href="platform:/plugin/org.eclipse.papyrus.uml.architecture/model/uml.architecture#_HQhf4sSYEeaKZJ_pGfaSiA"/>
@@ -10,14 +10,14 @@
   <concerns xmi:id="_yMTQcsSdEeaKZJ_pGfaSiA" id="org.eclipse.papyrus.systemsEngineering.requirements" name="Requirements" description="The concern of developing the system's requirements"/>
   <concerns xmi:id="_yMTQc8SdEeaKZJ_pGfaSiA" id="org.eclipse.papyrus.systemsEngineering.parametrics" name="Parametrics" description="The concern of developing the system's parametrics"/>
   <contexts xsi:type="architecture:ArchitectureDescriptionLanguage" xmi:id="_yMTQdMSdEeaKZJ_pGfaSiA" id="org.eclipse.papyrus.sysml.architecture.SysML" name="SysML" description="The Systems Modeling Language" icon="platform:/plugin/org.eclipse.papyrus.sysml.architecture/icons/sysml.gif" creationCommandClass="org.eclipse.papyrus.sysml.diagram.common.commands.CreateSysMLModelCommand">
-    <viewpoints xmi:id="_M5u1AMShEeaKZJ_pGfaSiA" id="org.eclipse.papyrus.sysml.analysis" name="Systems Analysis" description="A viewpoint allowing systems analysis with SysML">
+    <viewpoints xmi:id="_M5u1AMShEeaKZJ_pGfaSiA" id="org.eclipse.papyrus.sysml.analysis" name="Systems Analysis" description="A viewpoint allowing systems analysis with SysML" icon="platform:/plugin/org.eclipse.papyrus.sysml.architecture/icons/viewpoint.gif">
       <representationKinds xsi:type="gmfdiagrepresentation:PapyrusDiagram" href="#_iBC4gHDvEeWh-MssWmCB_A"/>
       <representationKinds xsi:type="gmfdiagrepresentation:PapyrusDiagram" href="platform:/plugin/org.eclipse.papyrus.uml.architecture/model/uml.architecture#_yeY0sHDvEeWh-MssWmCB_A"/>
       <representationKinds xsi:type="gmfdiagrepresentation:PapyrusDiagram" href="#_m2D8IHDuEeWh-MssWmCB_A"/>
       <representationKinds xsi:type="nattablerepresentation:PapyrusTable" href="#_lTE0gHDwEeWh-MssWmCB_A"/>
       <representationKinds xsi:type="nattablerepresentation:PapyrusTable" href="platform:/plugin/org.eclipse.papyrus.uml.architecture/model/uml.architecture#_d4-QwCT-EeedRqoTe_1ZiA"/>
     </viewpoints>
-    <viewpoints xmi:id="_PAtvoMShEeaKZJ_pGfaSiA" id="org.eclipse.papyrus.sysml.design" name="Systems Design" description="A viewpoint allowing systems design with SysML">
+    <viewpoints xmi:id="_PAtvoMShEeaKZJ_pGfaSiA" id="org.eclipse.papyrus.sysml.design" name="Systems Design" description="A viewpoint allowing systems design with SysML" icon="platform:/plugin/org.eclipse.papyrus.sysml.architecture/icons/viewpoint.gif">
       <representationKinds xsi:type="gmfdiagrepresentation:PapyrusDiagram" href="#_m2D8IHDuEeWh-MssWmCB_A"/>
       <representationKinds xsi:type="gmfdiagrepresentation:PapyrusDiagram" href="#_eHbioHDvEeWh-MssWmCB_A"/>
       <representationKinds xsi:type="gmfdiagrepresentation:PapyrusDiagram" href="#_eHbipHDvEeWh-MssWmCB_A"/>