diff --git a/plugins/org.etsi.mts.tdl.graphical.viewpoint/build.properties b/plugins/org.etsi.mts.tdl.graphical.viewpoint/build.properties
index 80990852e5b381f5ff1c64b469e5c413858c6528..bfd8cd54b78d91168a9a2c0f8fcd816b3d836b9b 100644
--- a/plugins/org.etsi.mts.tdl.graphical.viewpoint/build.properties
+++ b/plugins/org.etsi.mts.tdl.graphical.viewpoint/build.properties
@@ -7,5 +7,7 @@ bin.includes = META-INF/,\
                Configuration.svg,\
                tdl.ecore,\
                images/,\
-               plugin.properties
+               plugin.properties,\
+               extension.ecore,\
+               icons/
 customBuildCallbacks = build.acceleo
diff --git a/plugins/org.etsi.mts.tdl.graphical.viewpoint/description/TDL.odesign b/plugins/org.etsi.mts.tdl.graphical.viewpoint/description/TDL.odesign
index b202b84da8c03b1d85c05a1138b607663f29257a..6906527416bfc5afc11e9d1c12797dfa9940978f 100644
--- a/plugins/org.etsi.mts.tdl.graphical.viewpoint/description/TDL.odesign
+++ b/plugins/org.etsi.mts.tdl.graphical.viewpoint/description/TDL.odesign
@@ -466,7 +466,7 @@
           </ownedTools>
         </toolSections>
         <toolSections name="createCombined" label="Combined Behaviours">
-          <ownedTools xsi:type="tool:CombinedFragmentCreationTool" name="createAlternativeBehaviour" label="Alternative" containerMappings="//@ownedViewpoints[name='org.etsi.mts.tdl']/@ownedRepresentations[name='TestDescriptionDiagram']/@defaultLayer/@containerMappings[name='combinedBehaviour']">
+          <ownedTools xsi:type="tool:CombinedFragmentCreationTool" name="createAlternativeBehaviour" label="Alternative" containerMappings="//@ownedViewpoints[name='org.etsi.mts.tdl']/@ownedRepresentations[name='TestDescriptionDiagram']/@defaultLayer/@containerMappings[name='combinedBehaviour']" iconPath="icons/blank.png">
             <variable name="variable"/>
             <viewVariable name="viewVariable"/>
             <initialOperation>
@@ -482,7 +482,7 @@
             <finishingEndPredecessor name="finishingEndPredecessor"/>
             <coveredLifelines name="coveredLifelines"/>
           </ownedTools>
-          <ownedTools xsi:type="tool:CombinedFragmentCreationTool" name="createBoundedLoopBehaviour" label="Bounded Loop" containerMappings="//@ownedViewpoints[name='org.etsi.mts.tdl']/@ownedRepresentations[name='TestDescriptionDiagram']/@defaultLayer/@containerMappings[name='combinedBehaviour']">
+          <ownedTools xsi:type="tool:CombinedFragmentCreationTool" name="createBoundedLoopBehaviour" label="Bounded Loop" containerMappings="//@ownedViewpoints[name='org.etsi.mts.tdl']/@ownedRepresentations[name='TestDescriptionDiagram']/@defaultLayer/@containerMappings[name='combinedBehaviour']" iconPath="icons/blank.png">
             <variable name="variable"/>
             <viewVariable name="viewVariable"/>
             <initialOperation>
@@ -498,7 +498,7 @@
             <finishingEndPredecessor name="finishingEndPredecessor"/>
             <coveredLifelines name="coveredLifelines"/>
           </ownedTools>
-          <ownedTools xsi:type="tool:CombinedFragmentCreationTool" name="createConditionalBehaviour" label="Conditional" containerMappings="//@ownedViewpoints[name='org.etsi.mts.tdl']/@ownedRepresentations[name='TestDescriptionDiagram']/@defaultLayer/@containerMappings[name='combinedBehaviour']">
+          <ownedTools xsi:type="tool:CombinedFragmentCreationTool" name="createConditionalBehaviour" label="Conditional" containerMappings="//@ownedViewpoints[name='org.etsi.mts.tdl']/@ownedRepresentations[name='TestDescriptionDiagram']/@defaultLayer/@containerMappings[name='combinedBehaviour']" iconPath="icons/blank.png">
             <variable name="variable"/>
             <viewVariable name="viewVariable"/>
             <initialOperation>
@@ -514,7 +514,7 @@
             <finishingEndPredecessor name="finishingEndPredecessor"/>
             <coveredLifelines name="coveredLifelines"/>
           </ownedTools>
-          <ownedTools xsi:type="tool:CombinedFragmentCreationTool" name="createParallelBehaviour" label="Parallel" containerMappings="//@ownedViewpoints[name='org.etsi.mts.tdl']/@ownedRepresentations[name='TestDescriptionDiagram']/@defaultLayer/@containerMappings[name='combinedBehaviour']">
+          <ownedTools xsi:type="tool:CombinedFragmentCreationTool" name="createParallelBehaviour" label="Parallel" containerMappings="//@ownedViewpoints[name='org.etsi.mts.tdl']/@ownedRepresentations[name='TestDescriptionDiagram']/@defaultLayer/@containerMappings[name='combinedBehaviour']" iconPath="icons/blank.png">
             <variable name="variable"/>
             <viewVariable name="viewVariable"/>
             <initialOperation>
@@ -530,7 +530,7 @@
             <finishingEndPredecessor name="finishingEndPredecessor"/>
             <coveredLifelines name="coveredLifelines"/>
           </ownedTools>
-          <ownedTools xsi:type="tool:CombinedFragmentCreationTool" name="createUnboundedLoopBehaviour" label="Unbounded Loop" containerMappings="//@ownedViewpoints[name='org.etsi.mts.tdl']/@ownedRepresentations[name='TestDescriptionDiagram']/@defaultLayer/@containerMappings[name='combinedBehaviour']">
+          <ownedTools xsi:type="tool:CombinedFragmentCreationTool" name="createUnboundedLoopBehaviour" label="Unbounded Loop" containerMappings="//@ownedViewpoints[name='org.etsi.mts.tdl']/@ownedRepresentations[name='TestDescriptionDiagram']/@defaultLayer/@containerMappings[name='combinedBehaviour']" iconPath="icons/blank.png">
             <variable name="variable"/>
             <viewVariable name="viewVariable"/>
             <initialOperation>
@@ -597,7 +597,7 @@
               </firstModelOperations>
             </initialOperation>
           </ownedTools>
-          <ownedTools xsi:type="tool:InteractionUseCreationTool" name="createBreak" label="Break" containerMappings="//@ownedViewpoints[name='org.etsi.mts.tdl']/@ownedRepresentations[name='TestDescriptionDiagram']/@defaultLayer/@containerMappings[name='globalAction']">
+          <ownedTools xsi:type="tool:InteractionUseCreationTool" name="createBreak" label="Break" containerMappings="//@ownedViewpoints[name='org.etsi.mts.tdl']/@ownedRepresentations[name='TestDescriptionDiagram']/@defaultLayer/@containerMappings[name='globalAction']" iconPath="icons/blank.png">
             <variable name="variable"/>
             <viewVariable name="viewVariable"/>
             <initialOperation>
@@ -613,7 +613,7 @@
             <finishingEndPredecessor name="finishingEndPredecessor"/>
             <coveredLifelines name="coveredLifelines"/>
           </ownedTools>
-          <ownedTools xsi:type="tool:InteractionUseCreationTool" name="createStop" label="Stop" containerMappings="//@ownedViewpoints[name='org.etsi.mts.tdl']/@ownedRepresentations[name='TestDescriptionDiagram']/@defaultLayer/@containerMappings[name='globalAction']">
+          <ownedTools xsi:type="tool:InteractionUseCreationTool" name="createStop" label="Stop" containerMappings="//@ownedViewpoints[name='org.etsi.mts.tdl']/@ownedRepresentations[name='TestDescriptionDiagram']/@defaultLayer/@containerMappings[name='globalAction']" iconPath="icons/blank.png">
             <variable name="variable"/>
             <viewVariable name="viewVariable"/>
             <initialOperation>
@@ -782,7 +782,7 @@
               </firstModelOperations>
             </initialOperation>
           </ownedTools>
-          <ownedTools xsi:type="tool:InteractionUseCreationTool" name="createWait" label="Wait" containerMappings="//@ownedViewpoints[name='org.etsi.mts.tdl']/@ownedRepresentations[name='TestDescriptionDiagram']/@defaultLayer/@containerMappings[name='timeOperation']">
+          <ownedTools xsi:type="tool:InteractionUseCreationTool" name="createWait" label="Wait" containerMappings="//@ownedViewpoints[name='org.etsi.mts.tdl']/@ownedRepresentations[name='TestDescriptionDiagram']/@defaultLayer/@containerMappings[name='timeOperation']" iconPath="icons/blank.png">
             <variable name="variable"/>
             <viewVariable name="viewVariable"/>
             <initialOperation>
@@ -799,7 +799,7 @@
             <finishingEndPredecessor name="finishingEndPredecessor"/>
             <coveredLifelines name="coveredLifelines"/>
           </ownedTools>
-          <ownedTools xsi:type="tool:InteractionUseCreationTool" name="createQuiescence" label="Quiescence" containerMappings="//@ownedViewpoints[name='org.etsi.mts.tdl']/@ownedRepresentations[name='TestDescriptionDiagram']/@defaultLayer/@containerMappings[name='timeOperation']">
+          <ownedTools xsi:type="tool:InteractionUseCreationTool" name="createQuiescence" label="Quiescence" containerMappings="//@ownedViewpoints[name='org.etsi.mts.tdl']/@ownedRepresentations[name='TestDescriptionDiagram']/@defaultLayer/@containerMappings[name='timeOperation']" iconPath="icons/blank.png">
             <variable name="variable"/>
             <viewVariable name="viewVariable"/>
             <initialOperation>
diff --git a/plugins/org.etsi.mts.tdl.graphical.viewpoint/icons/blank.png b/plugins/org.etsi.mts.tdl.graphical.viewpoint/icons/blank.png
new file mode 100644
index 0000000000000000000000000000000000000000..2189b5566ad20fa8e2374ef2e21018ef19b2665e
Binary files /dev/null and b/plugins/org.etsi.mts.tdl.graphical.viewpoint/icons/blank.png differ