From 6191447534d96a9c0136ee60ba734cac6d867c07 Mon Sep 17 00:00:00 2001
From: Phillipus <p.beauvoir@dadabeatnik.com>
Date: Sun, 20 Aug 2023 14:26:15 +0100
Subject: [PATCH] Adjust small icon figure position according to line width

---
 .../diagram/figures/diagram/DiagramModelReferenceFigure.java    | 2 +-
 .../diagram/figures/elements/ApplicationComponentFigure.java    | 2 +-
 .../editor/diagram/figures/elements/ArtifactFigure.java         | 2 +-
 .../editor/diagram/figures/elements/AssessmentFigure.java       | 2 +-
 .../editor/diagram/figures/elements/BusinessActorFigure.java    | 2 +-
 .../editor/diagram/figures/elements/BusinessRoleFigure.java     | 2 +-
 .../editor/diagram/figures/elements/CapabilityFigure.java       | 2 +-
 .../editor/diagram/figures/elements/CollaborationFigure.java    | 2 +-
 .../diagram/figures/elements/CommunicationNetworkFigure.java    | 2 +-
 .../editor/diagram/figures/elements/ConstraintFigure.java       | 2 +-
 .../editor/diagram/figures/elements/CourseOfActionFigure.java   | 2 +-
 .../editor/diagram/figures/elements/DeliverableFigure.java      | 2 +-
 .../editor/diagram/figures/elements/DeviceFigure.java           | 2 +-
 .../diagram/figures/elements/DistributionNetworkFigure.java     | 2 +-
 .../editor/diagram/figures/elements/DriverFigure.java           | 2 +-
 .../editor/diagram/figures/elements/EquipmentFigure.java        | 2 +-
 .../editor/diagram/figures/elements/EventFigure.java            | 2 +-
 .../editor/diagram/figures/elements/FacilityFigure.java         | 2 +-
 .../editor/diagram/figures/elements/FunctionFigure.java         | 2 +-
 .../editor/diagram/figures/elements/GapFigure.java              | 2 +-
 .../editor/diagram/figures/elements/GoalFigure.java             | 2 +-
 .../editor/diagram/figures/elements/GroupingFigure.java         | 2 +-
 .../editor/diagram/figures/elements/InteractionFigure.java      | 2 +-
 .../editor/diagram/figures/elements/InterfaceFigure.java        | 2 +-
 .../editor/diagram/figures/elements/LocationFigure.java         | 2 +-
 .../editor/diagram/figures/elements/MaterialFigure.java         | 2 +-
 .../editor/diagram/figures/elements/MeaningFigure.java          | 2 +-
 .../editor/diagram/figures/elements/NodeFigure.java             | 2 +-
 .../editor/diagram/figures/elements/ObjectFigure.java           | 2 +-
 .../editor/diagram/figures/elements/OutcomeFigure.java          | 2 +-
 .../editor/diagram/figures/elements/PathFigure.java             | 2 +-
 .../editor/diagram/figures/elements/PlateauFigure.java          | 2 +-
 .../editor/diagram/figures/elements/PrincipleFigure.java        | 2 +-
 .../editor/diagram/figures/elements/ProcessFigure.java          | 2 +-
 .../editor/diagram/figures/elements/ProductFigure.java          | 2 +-
 .../editor/diagram/figures/elements/RequirementFigure.java      | 2 +-
 .../editor/diagram/figures/elements/ResourceFigure.java         | 2 +-
 .../editor/diagram/figures/elements/ServiceFigure.java          | 2 +-
 .../editor/diagram/figures/elements/StakeholderFigure.java      | 2 +-
 .../editor/diagram/figures/elements/SystemSoftwareFigure.java   | 2 +-
 .../editor/diagram/figures/elements/ValueFigure.java            | 2 +-
 .../editor/diagram/figures/elements/ValueStreamFigure.java      | 2 +-
 .../editor/diagram/figures/elements/WorkPackageFigure.java      | 2 +-
 43 files changed, 43 insertions(+), 43 deletions(-)

diff --git a/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/diagram/DiagramModelReferenceFigure.java b/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/diagram/DiagramModelReferenceFigure.java
index 2cc95b791..94e9c943a 100644
--- a/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/diagram/DiagramModelReferenceFigure.java
+++ b/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/diagram/DiagramModelReferenceFigure.java
@@ -62,7 +62,7 @@ protected void drawIcon(Graphics graphics) {
      */
     protected Point getIconOrigin() {
         Rectangle bounds = getBounds();
-        return new Point(bounds.x + bounds.width - 19, bounds.y + 6);
+        return new Point(bounds.x + bounds.width - 18 - getLineWidth(), bounds.y + 6);
     }
     
     @Override
diff --git a/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/ApplicationComponentFigure.java b/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/ApplicationComponentFigure.java
index 87811e814..de0539616 100644
--- a/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/ApplicationComponentFigure.java
+++ b/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/ApplicationComponentFigure.java
@@ -157,7 +157,7 @@ protected void drawIcon(Graphics graphics) {
      */
     protected Point getIconOrigin() {
         Rectangle bounds = getBounds();
-        return new Point(bounds.x + bounds.width - 15, bounds.y + 19);
+        return new Point(bounds.x + bounds.width - 14 - getLineWidth(), bounds.y + 19);
     }
     
     @Override
diff --git a/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/ArtifactFigure.java b/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/ArtifactFigure.java
index 2f65eefa7..3809037bf 100644
--- a/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/ArtifactFigure.java
+++ b/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/ArtifactFigure.java
@@ -146,7 +146,7 @@ private void drawIcon(Graphics graphics) {
      */
     private Point getIconOrigin() {
         Rectangle bounds = getBounds();
-        return new Point(bounds.x + bounds.width - 16, bounds.y + 6);
+        return new Point(bounds.x + bounds.width - 15 - getLineWidth(), bounds.y + 6);
     }
 
     @Override
diff --git a/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/AssessmentFigure.java b/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/AssessmentFigure.java
index 0c6ca395c..002045ae5 100644
--- a/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/AssessmentFigure.java
+++ b/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/AssessmentFigure.java
@@ -147,7 +147,7 @@ private void drawIcon(Graphics graphics) {
      */
     private Point getIconOrigin() {
         Rectangle bounds = getBounds();
-        return new Point(bounds.x + bounds.width - 15, bounds.y + 6);
+        return new Point(bounds.x + bounds.width - 14 - getLineWidth(), bounds.y + 6);
     }
     
     @Override
diff --git a/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/BusinessActorFigure.java b/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/BusinessActorFigure.java
index 92069c206..cdd5382aa 100644
--- a/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/BusinessActorFigure.java
+++ b/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/BusinessActorFigure.java
@@ -143,7 +143,7 @@ private void drawIcon(Graphics graphics) {
      */
     private Point getIconOrigin() {
         Rectangle bounds = getBounds().getCopy();
-        return new Point(bounds.x + bounds.width - 13, bounds.y + 4);
+        return new Point(bounds.x + bounds.width - 10 - getLineWidth(), bounds.y + 4);
     }
 
     @Override
diff --git a/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/BusinessRoleFigure.java b/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/BusinessRoleFigure.java
index bb6c4b0ed..c6c7c3869 100644
--- a/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/BusinessRoleFigure.java
+++ b/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/BusinessRoleFigure.java
@@ -77,7 +77,7 @@ private void drawIcon(Graphics graphics) {
      */
     private Point getIconOrigin() {
         Rectangle bounds = getBounds();
-        return new Point(bounds.getRight().x - 18, bounds.y + 7);
+        return new Point(bounds.getRight().x - 17 - getLineWidth(), bounds.y + 7);
     }
     
     @Override
diff --git a/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/CapabilityFigure.java b/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/CapabilityFigure.java
index 997d551e4..1449644e0 100644
--- a/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/CapabilityFigure.java
+++ b/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/CapabilityFigure.java
@@ -148,7 +148,7 @@ private void drawIcon(Graphics graphics) {
      */
     private Point getIconOrigin() {
         Rectangle bounds = getBounds();
-        return new Point(bounds.getRight().x - 17, bounds.y + 5);
+        return new Point(bounds.getRight().x - 16 - getLineWidth(), bounds.y + 5);
     }
 
     @Override
diff --git a/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/CollaborationFigure.java b/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/CollaborationFigure.java
index 592d77821..26ea29f55 100644
--- a/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/CollaborationFigure.java
+++ b/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/CollaborationFigure.java
@@ -124,7 +124,7 @@ private void drawIcon(Graphics graphics) {
      */
     private Point getIconOrigin() {
         Rectangle bounds = getBounds();
-        return new Point(bounds.x + bounds.width - 18, bounds.y + 7);
+        return new Point(bounds.x + bounds.width - 17 - getLineWidth(), bounds.y + 7);
     }
 
     @Override
diff --git a/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/CommunicationNetworkFigure.java b/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/CommunicationNetworkFigure.java
index d46d0addb..053e345c3 100644
--- a/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/CommunicationNetworkFigure.java
+++ b/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/CommunicationNetworkFigure.java
@@ -151,7 +151,7 @@ private void drawIcon(Graphics graphics) {
      */
     private Point getIconOrigin() {
         Rectangle bounds = getBounds();
-        return new Point(bounds.x + bounds.width - 20, bounds.y + 14);
+        return new Point(bounds.x + bounds.width - 18 - getLineWidth(), bounds.y + 14);
     }
 
     @Override
diff --git a/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/ConstraintFigure.java b/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/ConstraintFigure.java
index 7e290255e..c4fcb78a5 100644
--- a/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/ConstraintFigure.java
+++ b/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/ConstraintFigure.java
@@ -68,7 +68,7 @@ protected void drawIcon(Graphics graphics) {
      */
     protected Point getIconOrigin() {
         Rectangle bounds = getBounds();
-        return new Point(bounds.x + bounds.width - 18, bounds.y + 8);
+        return new Point(bounds.x + bounds.width - 18 - getLineWidth(), bounds.y + 8);
     }
 
     @Override
diff --git a/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/CourseOfActionFigure.java b/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/CourseOfActionFigure.java
index bcf6bd7fe..f3bec9b4e 100644
--- a/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/CourseOfActionFigure.java
+++ b/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/CourseOfActionFigure.java
@@ -219,7 +219,7 @@ private void drawIcon(Graphics graphics) {
      */
     private Point getIconOrigin() {
         Rectangle bounds = getBounds();
-        return new Point(bounds.getRight().x - 17, bounds.y + 3);
+        return new Point(bounds.getRight().x - 16 - getLineWidth(), bounds.y + 2 + getLineWidth());
     }
 
     @Override
diff --git a/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/DeliverableFigure.java b/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/DeliverableFigure.java
index c78a7a83a..26f0adac3 100644
--- a/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/DeliverableFigure.java
+++ b/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/DeliverableFigure.java
@@ -126,7 +126,7 @@ protected void drawIcon(Graphics graphics) {
      */
     protected Point getIconOrigin() {
         Rectangle bounds = getBounds();
-        return new Point(bounds.x + bounds.width - 19, bounds.y + 6);
+        return new Point(bounds.x + bounds.width - 17 - getLineWidth(), bounds.y + 6);
     }
     
     @Override
diff --git a/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/DeviceFigure.java b/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/DeviceFigure.java
index ec134d3c1..ae272c6fe 100644
--- a/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/DeviceFigure.java
+++ b/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/DeviceFigure.java
@@ -133,7 +133,7 @@ protected void drawIcon(Graphics graphics) {
      */
     protected Point getIconOrigin() {
         Rectangle bounds = getBounds();
-        return new Point(bounds.x + bounds.width - 17, bounds.y + 5);
+        return new Point(bounds.x + bounds.width - 15 - getLineWidth(), bounds.y + 5);
     }
     
     @Override
diff --git a/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/DistributionNetworkFigure.java b/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/DistributionNetworkFigure.java
index 1b5285e0e..b974e0d8c 100644
--- a/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/DistributionNetworkFigure.java
+++ b/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/DistributionNetworkFigure.java
@@ -212,7 +212,7 @@ protected void drawIcon(Graphics graphics) {
     
     private Point getIconOrigin() {
         Rectangle bounds = getBounds();
-        return new Point(bounds.x + bounds.width - 20, bounds.y + 12);
+        return new Point(bounds.x + bounds.width - 19 - getLineWidth(), bounds.y + 12);
     }
     
     @Override
diff --git a/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/DriverFigure.java b/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/DriverFigure.java
index 306cd734c..7f4ab2c0c 100644
--- a/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/DriverFigure.java
+++ b/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/DriverFigure.java
@@ -168,7 +168,7 @@ private void drawIcon(Graphics graphics) {
      */
     private Point getIconOrigin() {
         Rectangle bounds = getBounds();
-        return new Point(bounds.x + bounds.width - 21, bounds.y + 6);
+        return new Point(bounds.x + bounds.width - 20 - getLineWidth(), bounds.y + 6);
     }
     
     @Override
diff --git a/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/EquipmentFigure.java b/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/EquipmentFigure.java
index 44a6f9016..fc57e277c 100644
--- a/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/EquipmentFigure.java
+++ b/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/EquipmentFigure.java
@@ -234,7 +234,7 @@ private void drawIconCog(Graphics graphics, Point center, int segments, int r1,
      */
     private Point getIconOrigin() {
         Rectangle bounds = getBounds();
-        return new Point(bounds.x + bounds.width - 19, bounds.y + 17);
+        return new Point(bounds.x + bounds.width - 18 - getLineWidth(), bounds.y + 17);
     }
     
     @Override
diff --git a/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/EventFigure.java b/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/EventFigure.java
index de879f809..019a80c56 100644
--- a/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/EventFigure.java
+++ b/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/EventFigure.java
@@ -135,7 +135,7 @@ protected void drawIcon(Graphics graphics) {
      */
     protected Point getIconOrigin() {
         Rectangle bounds = getBounds();
-        return new Point(bounds.x + bounds.width - 20, bounds.y + 7);
+        return new Point(bounds.x + bounds.width - 19 - getLineWidth(), bounds.y + 7);
     }
 
     @Override
diff --git a/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/FacilityFigure.java b/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/FacilityFigure.java
index 729e8c747..89e3e3a19 100644
--- a/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/FacilityFigure.java
+++ b/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/FacilityFigure.java
@@ -158,7 +158,7 @@ private void drawIcon(Graphics graphics) {
      */
     private Point getIconOrigin() {
         Rectangle bounds = getBounds();
-        return new Point(bounds.getRight().x - 20, bounds.y + 17);
+        return new Point(bounds.getRight().x - 19 - getLineWidth(), bounds.y + 17);
     }
     
     @Override
diff --git a/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/FunctionFigure.java b/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/FunctionFigure.java
index 3e113f1e4..bde82f3f1 100644
--- a/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/FunctionFigure.java
+++ b/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/FunctionFigure.java
@@ -165,7 +165,7 @@ private void drawIcon(Graphics graphics) {
      */
     private Point getIconOrigin() {
         Rectangle bounds = getBounds();
-        return new Point(bounds.x + bounds.width - 18, bounds.y + 19);
+        return new Point(bounds.x + bounds.width - 16 - getLineWidth(), bounds.y + 19);
     }
     
     @Override
diff --git a/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/GapFigure.java b/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/GapFigure.java
index ded12e150..6c888e6f5 100644
--- a/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/GapFigure.java
+++ b/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/GapFigure.java
@@ -130,7 +130,7 @@ private void drawIcon(Graphics graphics) {
      */
     private Point getIconOrigin() {
         Rectangle bounds = getBounds();
-        return new Point(bounds.x + bounds.width - 20, bounds.y + 6);
+        return new Point(bounds.x + bounds.width - 17 - getLineWidth(), bounds.y + 6);
     }
     
     @Override
diff --git a/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/GoalFigure.java b/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/GoalFigure.java
index 79f4f2168..76a34350b 100644
--- a/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/GoalFigure.java
+++ b/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/GoalFigure.java
@@ -127,7 +127,7 @@ private void drawIcon(Graphics graphics) {
      */
     private Point getIconOrigin() {
         Rectangle bounds = getBounds();
-        return new Point(bounds.x + bounds.width - 20, bounds.y + 6);
+        return new Point(bounds.x + bounds.width - 19 - getLineWidth(), bounds.y + 6);
     }
     
     @Override
diff --git a/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/GroupingFigure.java b/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/GroupingFigure.java
index f0f3cb9d3..5e8331980 100644
--- a/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/GroupingFigure.java
+++ b/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/GroupingFigure.java
@@ -234,7 +234,7 @@ private void drawIcon(Graphics graphics) {
      */
     private Point getIconOrigin() {
         Rectangle bounds = getBounds();
-        return new Point(bounds.x + bounds.width - 18, bounds.y + 6);
+        return new Point(bounds.x + bounds.width - 17 - getLineWidth(), bounds.y + 6);
     }
     
     @Override
diff --git a/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/InteractionFigure.java b/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/InteractionFigure.java
index f13ca474d..56c2ee305 100644
--- a/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/InteractionFigure.java
+++ b/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/InteractionFigure.java
@@ -153,7 +153,7 @@ private void drawIcon(Graphics graphics) {
      */
     private Point getIconOrigin() {
         Rectangle bounds = getBounds();
-        return new Point(bounds.x + bounds.width - 13, bounds.y + 6);
+        return new Point(bounds.x + bounds.width - 11 - getLineWidth(), bounds.y + 6);
     }
     
     @Override
diff --git a/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/InterfaceFigure.java b/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/InterfaceFigure.java
index da439c83c..a7884f41d 100644
--- a/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/InterfaceFigure.java
+++ b/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/InterfaceFigure.java
@@ -123,7 +123,7 @@ private void drawIcon(Graphics graphics) {
      */
     private Point getIconOrigin() {
         Rectangle bounds = getBounds();
-        return new Point(bounds.x + bounds.width - 14, bounds.y + 8);
+        return new Point(bounds.x + bounds.width - 13 - getLineWidth(), bounds.y + 8);
     }
     
     @Override
diff --git a/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/LocationFigure.java b/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/LocationFigure.java
index eb9471968..220a8e7c5 100644
--- a/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/LocationFigure.java
+++ b/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/LocationFigure.java
@@ -139,7 +139,7 @@ private void drawIcon(Graphics graphics) {
      */
     private Point getIconOrigin() {
         Rectangle bounds = getBounds();
-        return new Point(bounds.x + bounds.width - 10, bounds.y + 20);
+        return new Point(bounds.x + bounds.width - 8 - getLineWidth(), bounds.y + 20);
     }
 
     @Override
diff --git a/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/MaterialFigure.java b/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/MaterialFigure.java
index 1a0a22193..8b0d5626a 100644
--- a/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/MaterialFigure.java
+++ b/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/MaterialFigure.java
@@ -165,7 +165,7 @@ private void drawIcon(Graphics graphics) {
      */
     private Point getIconOrigin() {
         Rectangle bounds = getBounds();
-        return new Point(bounds.x + bounds.width - 12, bounds.y + 12);
+        return new Point(bounds.x + bounds.width - 11 - getLineWidth(), bounds.y + 12);
     }
 
     @Override
diff --git a/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/MeaningFigure.java b/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/MeaningFigure.java
index d1fa361af..2114fb2ca 100644
--- a/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/MeaningFigure.java
+++ b/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/MeaningFigure.java
@@ -133,7 +133,7 @@ private void drawIcon(Graphics graphics) {
      */
     private Point getIconOrigin() {
         Rectangle bounds = getBounds().getCopy();
-        return new Point(bounds.x + bounds.width - 18, bounds.y + 8);
+        return new Point(bounds.x + bounds.width - 17 - getLineWidth(), bounds.y + 8);
     }
 
     @Override
diff --git a/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/NodeFigure.java b/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/NodeFigure.java
index d7b792c6f..024f2b5a4 100644
--- a/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/NodeFigure.java
+++ b/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/NodeFigure.java
@@ -87,7 +87,7 @@ protected void drawIcon(Graphics graphics) {
      */
     protected Point getIconOrigin() {
         Rectangle bounds = getBounds();
-        return new Point(bounds.x + bounds.width - 18, bounds.y + 8);
+        return new Point(bounds.x + bounds.width - 17 - getLineWidth(), bounds.y + 8);
     }
     
     @Override
diff --git a/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/ObjectFigure.java b/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/ObjectFigure.java
index f1b18e62d..545cfd162 100644
--- a/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/ObjectFigure.java
+++ b/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/ObjectFigure.java
@@ -134,7 +134,7 @@ protected void drawIcon(Graphics graphics) {
      */
     protected Point getIconOrigin() {
         Rectangle bounds = getBounds();
-        return new Point(bounds.x + bounds.width - 18, bounds.y + 6);
+        return new Point(bounds.x + bounds.width - 17 - getLineWidth(), bounds.y + 6);
     }
     
     @Override
diff --git a/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/OutcomeFigure.java b/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/OutcomeFigure.java
index db91a26b8..470eaec00 100644
--- a/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/OutcomeFigure.java
+++ b/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/OutcomeFigure.java
@@ -183,7 +183,7 @@ private void drawIcon(Graphics graphics) {
      */
     private Point getIconOrigin() {
         Rectangle bounds = getBounds();
-        return new Point(bounds.x + bounds.width - 25, bounds.y + 9);
+        return new Point(bounds.x + bounds.width - 24 - getLineWidth(), bounds.y + 9);
     }
     
     @Override
diff --git a/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/PathFigure.java b/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/PathFigure.java
index 004db2c5d..631e7cb87 100644
--- a/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/PathFigure.java
+++ b/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/PathFigure.java
@@ -95,6 +95,6 @@ protected void drawIcon(Graphics graphics) {
      */
     private Point getIconOrigin() {
         Rectangle bounds = getBounds();
-        return new Point(bounds.x + bounds.width - 20, bounds.y + 12);
+        return new Point(bounds.x + bounds.width - 19 - getLineWidth(), bounds.y + 12);
     }
 }
diff --git a/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/PlateauFigure.java b/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/PlateauFigure.java
index 558437948..7514633ba 100644
--- a/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/PlateauFigure.java
+++ b/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/PlateauFigure.java
@@ -110,7 +110,7 @@ private void drawIcon(Graphics graphics) {
      */
     private Point getIconOrigin() {
         Rectangle bounds = getBounds();
-        return new Point(bounds.x + bounds.width - 21, bounds.y + 13);
+        return new Point(bounds.x + bounds.width - 20 - getLineWidth(), bounds.y + 13);
     }
     
     @Override
diff --git a/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/PrincipleFigure.java b/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/PrincipleFigure.java
index 965dedf6d..b2f1f7315 100644
--- a/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/PrincipleFigure.java
+++ b/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/PrincipleFigure.java
@@ -172,7 +172,7 @@ private void drawIcon(Graphics graphics) {
      */
     private Point getIconOrigin() {
         Rectangle bounds = getBounds();
-        return new Point(bounds.x + bounds.width - 20, bounds.y + 6);
+        return new Point(bounds.x + bounds.width - 19 - getLineWidth(), bounds.y + 6);
     }
     
     @Override
diff --git a/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/ProcessFigure.java b/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/ProcessFigure.java
index 3af48e274..cd1e940cf 100644
--- a/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/ProcessFigure.java
+++ b/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/ProcessFigure.java
@@ -92,7 +92,7 @@ protected void drawIcon(Graphics graphics) {
      */
     protected Point getIconOrigin() {
         Rectangle bounds = getBounds();
-        return new Point(bounds.x + bounds.width - 18, bounds.y + 11);
+        return new Point(bounds.x + bounds.width - 17 - getLineWidth(), bounds.y + 11);
     }
 
     @Override
diff --git a/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/ProductFigure.java b/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/ProductFigure.java
index c37429625..627f5ac3b 100644
--- a/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/ProductFigure.java
+++ b/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/ProductFigure.java
@@ -137,7 +137,7 @@ private void drawIcon(Graphics graphics) {
      */
     private Point getIconOrigin() {
         Rectangle bounds = getBounds().getCopy();
-        return new Point(bounds.x + bounds.width - 18, bounds.y + 6);
+        return new Point(bounds.x + bounds.width - 17 - getLineWidth(), bounds.y + 6);
     }
 
     @Override
diff --git a/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/RequirementFigure.java b/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/RequirementFigure.java
index 895725ea7..600a362e2 100644
--- a/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/RequirementFigure.java
+++ b/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/RequirementFigure.java
@@ -66,7 +66,7 @@ protected void drawIcon(Graphics graphics) {
      */
     protected Point getIconOrigin() {
         Rectangle bounds = getBounds();
-        return new Point(bounds.x + bounds.width - 18, bounds.y + 8);
+        return new Point(bounds.x + bounds.width - 18 - getLineWidth(), bounds.y + 8);
     }
     
     @Override
diff --git a/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/ResourceFigure.java b/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/ResourceFigure.java
index 738ef1133..b5cc1d2c4 100644
--- a/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/ResourceFigure.java
+++ b/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/ResourceFigure.java
@@ -200,7 +200,7 @@ private void drawIcon(Graphics graphics) {
      */
     private Point getIconOrigin() {
         Rectangle bounds = getBounds();
-        return new Point(bounds.getRight().x - 20, bounds.y + 7);
+        return new Point(bounds.getRight().x - 19 - getLineWidth(), bounds.y + 7);
     }
 
     @Override
diff --git a/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/ServiceFigure.java b/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/ServiceFigure.java
index 33bdf757e..0e7f23d59 100644
--- a/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/ServiceFigure.java
+++ b/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/ServiceFigure.java
@@ -68,7 +68,7 @@ protected void drawIcon(Graphics graphics) {
      */
     protected Point getIconOrigin() {
         Rectangle bounds = getBounds();
-        return new Point(bounds.x + bounds.width - 21, bounds.y + 7);
+        return new Point(bounds.x + bounds.width - 20 - getLineWidth(), bounds.y + 7);
     }
 
     @Override
diff --git a/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/StakeholderFigure.java b/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/StakeholderFigure.java
index 7b2cded6f..fdc80a9a5 100644
--- a/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/StakeholderFigure.java
+++ b/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/StakeholderFigure.java
@@ -75,7 +75,7 @@ private void drawIcon(Graphics graphics) {
      */
     private Point getIconOrigin() {
         Rectangle bounds = getBounds();
-        return new Point(bounds.x + bounds.width - 21, bounds.y + 9);
+        return new Point(bounds.x + bounds.width - 20 - getLineWidth(), bounds.y + 9);
     }
     
     @Override
diff --git a/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/SystemSoftwareFigure.java b/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/SystemSoftwareFigure.java
index d737e6d1a..238d15e45 100644
--- a/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/SystemSoftwareFigure.java
+++ b/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/SystemSoftwareFigure.java
@@ -121,7 +121,7 @@ private void drawIcon(Graphics graphics) {
      */
     private Point getIconOrigin() {
         Rectangle bounds = getBounds().getCopy();
-        return getDiagramModelArchimateObject().getType() == 0 ? new Point(bounds.x + bounds.width - 18, bounds.y + 8) : new Point(bounds.x + bounds.width - 31, bounds.y + 20);
+        return new Point(bounds.x + bounds.width - 16 - getLineWidth(), bounds.y + 8);
     }
     
     @Override
diff --git a/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/ValueFigure.java b/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/ValueFigure.java
index 0e84ca7d1..f606296b9 100644
--- a/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/ValueFigure.java
+++ b/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/ValueFigure.java
@@ -128,7 +128,7 @@ private void drawIcon(Graphics graphics) {
      */
     private Point getIconOrigin() {
         Rectangle bounds = getBounds().getCopy();
-        return new Point(bounds.x + bounds.width - 20, bounds.y + 7);
+        return new Point(bounds.x + bounds.width - 19 - getLineWidth(), bounds.y + 7);
     }
 
     @Override
diff --git a/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/ValueStreamFigure.java b/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/ValueStreamFigure.java
index 18c827e1b..d9261ac87 100644
--- a/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/ValueStreamFigure.java
+++ b/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/ValueStreamFigure.java
@@ -157,7 +157,7 @@ protected void drawIcon(Graphics graphics) {
      */
     protected Point getIconOrigin() {
         Rectangle bounds = getBounds();
-        return new Point(bounds.getRight().x - 19, bounds.y + 7);
+        return new Point(bounds.getRight().x - 18 - getLineWidth(), bounds.y + 7);
     }
     
     @Override
diff --git a/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/WorkPackageFigure.java b/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/WorkPackageFigure.java
index 8d6ce7b71..c92870f88 100644
--- a/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/WorkPackageFigure.java
+++ b/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/WorkPackageFigure.java
@@ -184,7 +184,7 @@ private void drawIcon(Graphics graphics) {
      */
     private Point getIconOrigin() {
         Rectangle bounds = getBounds();
-        return new Point(bounds.x + bounds.width - 18, bounds.y + 6);
+        return new Point(bounds.x + bounds.width - 17 - getLineWidth(), bounds.y + 6);
     }
     
     @Override