diff --git a/src/sprites/archimate/application-event.png b/src/sprites/archimate/application-event.png
new file mode 100644
index 000000000..c08377106
Binary files /dev/null and b/src/sprites/archimate/application-event.png differ
diff --git a/src/sprites/archimate/application-process.png b/src/sprites/archimate/application-process.png
new file mode 100644
index 000000000..f5617043e
Binary files /dev/null and b/src/sprites/archimate/application-process.png differ
diff --git a/src/sprites/archimate/assessment-filled.png b/src/sprites/archimate/assessment-filled.png
deleted file mode 100644
index 94eee5d53..000000000
Binary files a/src/sprites/archimate/assessment-filled.png and /dev/null differ
diff --git a/src/sprites/archimate/business-contract.png b/src/sprites/archimate/business-contract.png
index 351e0ef08..f3a0fa4b2 100644
Binary files a/src/sprites/archimate/business-contract.png and b/src/sprites/archimate/business-contract.png differ
diff --git a/src/sprites/archimate/business-representation.png b/src/sprites/archimate/business-representation.png
index 7f12fe73c..43ee74a5a 100644
Binary files a/src/sprites/archimate/business-representation.png and b/src/sprites/archimate/business-representation.png differ
diff --git a/src/sprites/archimate/contract.png b/src/sprites/archimate/contract.png
index fe9c9bf4d..0773dbe25 100644
Binary files a/src/sprites/archimate/contract.png and b/src/sprites/archimate/contract.png differ
diff --git a/src/sprites/archimate/deliverable.png b/src/sprites/archimate/deliverable.png
new file mode 100644
index 000000000..b8a6fbdc1
Binary files /dev/null and b/src/sprites/archimate/deliverable.png differ
diff --git a/src/sprites/archimate/driver-filled.png b/src/sprites/archimate/driver-filled.png
deleted file mode 100644
index 62cbb1e4c..000000000
Binary files a/src/sprites/archimate/driver-filled.png and /dev/null differ
diff --git a/src/sprites/archimate/deliverable-filled.png b/src/sprites/archimate/implementation-deliverable.png
similarity index 100%
rename from src/sprites/archimate/deliverable-filled.png
rename to src/sprites/archimate/implementation-deliverable.png
diff --git a/src/sprites/archimate/implementation-event.png b/src/sprites/archimate/implementation-event.png
new file mode 100644
index 000000000..04c486e20
Binary files /dev/null and b/src/sprites/archimate/implementation-event.png differ
diff --git a/src/sprites/archimate/gap-filled.png b/src/sprites/archimate/implementation-gap.png
similarity index 100%
rename from src/sprites/archimate/gap-filled.png
rename to src/sprites/archimate/implementation-gap.png
diff --git a/src/sprites/archimate/implementation-plateau.png b/src/sprites/archimate/implementation-plateau.png
new file mode 100644
index 000000000..a7d63f0b6
Binary files /dev/null and b/src/sprites/archimate/implementation-plateau.png differ
diff --git a/src/sprites/archimate/workpackage-filled.png b/src/sprites/archimate/implementation-workpackage.png
similarity index 100%
rename from src/sprites/archimate/workpackage-filled.png
rename to src/sprites/archimate/implementation-workpackage.png
diff --git a/src/sprites/archimate/motivation-assessment.png b/src/sprites/archimate/motivation-assessment.png
new file mode 100644
index 000000000..11a2c5b34
Binary files /dev/null and b/src/sprites/archimate/motivation-assessment.png differ
diff --git a/src/sprites/archimate/constraint-filled.png b/src/sprites/archimate/motivation-constraint.png
similarity index 100%
rename from src/sprites/archimate/constraint-filled.png
rename to src/sprites/archimate/motivation-constraint.png
diff --git a/src/sprites/archimate/motivation-driver.png b/src/sprites/archimate/motivation-driver.png
new file mode 100644
index 000000000..0e4690e33
Binary files /dev/null and b/src/sprites/archimate/motivation-driver.png differ
diff --git a/src/sprites/archimate/goal-filled.png b/src/sprites/archimate/motivation-goal.png
similarity index 100%
rename from src/sprites/archimate/goal-filled.png
rename to src/sprites/archimate/motivation-goal.png
diff --git a/src/sprites/archimate/motivation-meaning.png b/src/sprites/archimate/motivation-meaning.png
new file mode 100644
index 000000000..417fbc23d
Binary files /dev/null and b/src/sprites/archimate/motivation-meaning.png differ
diff --git a/src/sprites/archimate/principle-filled.png b/src/sprites/archimate/motivation-principle.png
similarity index 100%
rename from src/sprites/archimate/principle-filled.png
rename to src/sprites/archimate/motivation-principle.png
diff --git a/src/sprites/archimate/requirement-filled.png b/src/sprites/archimate/motivation-requirement.png
similarity index 100%
rename from src/sprites/archimate/requirement-filled.png
rename to src/sprites/archimate/motivation-requirement.png
diff --git a/src/sprites/archimate/motivation-stakeholder.png b/src/sprites/archimate/motivation-stakeholder.png
new file mode 100644
index 000000000..8d4466f12
Binary files /dev/null and b/src/sprites/archimate/motivation-stakeholder.png differ
diff --git a/src/sprites/archimate/representation.png b/src/sprites/archimate/representation.png
deleted file mode 100644
index 0d8ac19e2..000000000
Binary files a/src/sprites/archimate/representation.png and /dev/null differ
diff --git a/src/sprites/archimate/stakeholder-filled.png b/src/sprites/archimate/stakeholder-filled.png
deleted file mode 100644
index 3925c0445..000000000
Binary files a/src/sprites/archimate/stakeholder-filled.png and /dev/null differ
diff --git a/src/sprites/archimate/technology-collaboration.png b/src/sprites/archimate/technology-collaboration.png
new file mode 100644
index 000000000..53e3c464b
Binary files /dev/null and b/src/sprites/archimate/technology-collaboration.png differ
diff --git a/src/sprites/archimate/technology-event.png b/src/sprites/archimate/technology-event.png
new file mode 100644
index 000000000..d688b04f1
Binary files /dev/null and b/src/sprites/archimate/technology-event.png differ
diff --git a/src/sprites/archimate/technology-interaction.png b/src/sprites/archimate/technology-interaction.png
new file mode 100644
index 000000000..9bee38f0c
Binary files /dev/null and b/src/sprites/archimate/technology-interaction.png differ
diff --git a/src/sprites/archimate/technology-process.png b/src/sprites/archimate/technology-process.png
new file mode 100644
index 000000000..a6765deaa
Binary files /dev/null and b/src/sprites/archimate/technology-process.png differ