diff --git a/com.archimatetool.canvas/src/com/archimatetool/canvas/figures/CanvasBlockFigure.java b/com.archimatetool.canvas/src/com/archimatetool/canvas/figures/CanvasBlockFigure.java
index 0183c2d1c..e2bb77d6e 100644
--- a/com.archimatetool.canvas/src/com/archimatetool/canvas/figures/CanvasBlockFigure.java
+++ b/com.archimatetool.canvas/src/com/archimatetool/canvas/figures/CanvasBlockFigure.java
@@ -160,7 +160,7 @@ private void drawFigure(Graphics graphics, Color background) {
         bounds.height--;
         
         // Set line width here so that the whole figure is constrained, otherwise SVG graphics will have overspill
-        setLineWidth(graphics, 1, bounds);
+        setLineWidth(graphics, bounds);
         
         graphics.setBackgroundColor(background);
         graphics.fillRectangle(bounds);
diff --git a/com.archimatetool.canvas/src/com/archimatetool/canvas/figures/CanvasStickyFigure.java b/com.archimatetool.canvas/src/com/archimatetool/canvas/figures/CanvasStickyFigure.java
index 557fbb061..79e2c4d62 100644
--- a/com.archimatetool.canvas/src/com/archimatetool/canvas/figures/CanvasStickyFigure.java
+++ b/com.archimatetool.canvas/src/com/archimatetool/canvas/figures/CanvasStickyFigure.java
@@ -140,8 +140,7 @@ protected void paintFigure(Graphics graphics) {
         bounds.height--;
         
         // Set line width here so that the whole figure is constrained, otherwise SVG graphics will have overspill
-        int lineWidth = 1;
-        setLineWidth(graphics, lineWidth, bounds);
+        setLineWidth(graphics, bounds);
         
         // Bug on Linux hi-res using Graphics.fillGradient()
         // See https://bugs.eclipse.org/bugs/show_bug.cgi?id=568864
@@ -162,7 +161,7 @@ protected void paintFigure(Graphics graphics) {
         if(getBorderColor() != null) {
             graphics.setAlpha(getLineAlpha());
             
-            float lineOffset = (float)lineWidth / 2;
+            float lineOffset = (float)getDiagramModelObject().getLineWidth() / 2;
 
             graphics.setForegroundColor(ColorFactory.getLighterColor(getBorderColor(), 0.82f));
             Path path = new Path(null);
diff --git a/com.archimatetool.editor/plugin.xml b/com.archimatetool.editor/plugin.xml
index 152438e54..50854fe2f 100644
--- a/com.archimatetool.editor/plugin.xml
+++ b/com.archimatetool.editor/plugin.xml
@@ -429,6 +429,13 @@
                id="iconColorSection"
                tab="appearance.tab">
          </propertySection>
+         <propertySection
+               afterSection="lineColorSection"
+               class="com.archimatetool.editor.propertysections.LineWidthSection"
+               filter="com.archimatetool.editor.propertysections.LineWidthSection$Filter"
+               id="lineWidthSection"
+               tab="appearance.tab">
+         </propertySection>
          <propertySection
                afterSection="iconColorSection"
                class="com.archimatetool.editor.propertysections.GradientSection"
diff --git a/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/AbstractDiagramModelObjectFigure.java b/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/AbstractDiagramModelObjectFigure.java
index 872d5d4c2..f64b5458d 100644
--- a/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/AbstractDiagramModelObjectFigure.java
+++ b/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/AbstractDiagramModelObjectFigure.java
@@ -96,6 +96,15 @@ protected void drawFigure(Graphics graphics) {
         }
     }
     
+    /**
+     * Set the line width to that in the diagram model and compensate the figure bounds width and height for this line width and translate the graphics instance
+     * @param graphics The graphics instance
+     * @param bounds The bounds of the object
+     */
+    protected void setLineWidth(Graphics graphics, Rectangle bounds) {
+        setLineWidth(graphics, getDiagramModelObject().getLineWidth(), bounds);
+    }
+    
     /**
      * Set the line width and compensate the figure bounds width and height for this line width and translate the graphics instance
      * @param graphics The graphics instance
@@ -103,6 +112,8 @@ protected void drawFigure(Graphics graphics) {
      * @param bounds The bounds of the object
      */
     protected void setLineWidth(Graphics graphics, int lineWidth, Rectangle bounds) {
+        lineWidth = lineWidth < 1 ? 1 : lineWidth > 4 ? 4 : lineWidth;
+        
         graphics.setLineWidth(lineWidth);
         
         final double scale = FigureUtils.getGraphicsScale(graphics);
diff --git a/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/AbstractFigureDelegate.java b/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/AbstractFigureDelegate.java
index 337c3e47a..688d06c0d 100644
--- a/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/AbstractFigureDelegate.java
+++ b/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/AbstractFigureDelegate.java
@@ -103,6 +103,15 @@ protected void setDisabledState(Graphics graphics) {
         getOwner().setDisabledState(graphics);
     }
     
+    /**
+     * Set the line width to that in the diagram model and compensate the figure bounds width and height for this line width and translate the graphics instance
+     * @param graphics The graphics instance
+     * @param bounds The bounds of the object
+     */
+    protected void setLineWidth(Graphics graphics, Rectangle bounds) {
+        getOwner().setLineWidth(graphics, bounds);
+    }
+
     /**
      * Set the line width and compensate the figure bounds width and height for this line width and translate the graphics instance
      * @param graphics The graphics instance
diff --git a/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/EllipseFigureDelegate.java b/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/EllipseFigureDelegate.java
index 90bf9261b..7c7a0c1b3 100644
--- a/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/EllipseFigureDelegate.java
+++ b/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/EllipseFigureDelegate.java
@@ -32,7 +32,7 @@ public void drawFigure(Graphics graphics) {
         bounds.height--;
 
         // Line Width
-        setLineWidth(graphics, 1, bounds);
+        setLineWidth(graphics, bounds);
         
         graphics.setAlpha(getAlpha());
         
diff --git a/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/RectangleFigureDelegate.java b/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/RectangleFigureDelegate.java
index d86218fd6..48e101ae2 100644
--- a/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/RectangleFigureDelegate.java
+++ b/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/RectangleFigureDelegate.java
@@ -32,7 +32,7 @@ public void drawFigure(Graphics graphics) {
         bounds.height--;
 
         // Set line width here so that the whole figure is constrained, otherwise SVG graphics will have overspill
-        setLineWidth(graphics, 1, bounds);
+        setLineWidth(graphics, bounds);
 
         graphics.setAlpha(getAlpha());
         
diff --git a/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/RoundedRectangleFigureDelegate.java b/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/RoundedRectangleFigureDelegate.java
index a6dea56c2..5bfddb925 100644
--- a/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/RoundedRectangleFigureDelegate.java
+++ b/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/RoundedRectangleFigureDelegate.java
@@ -37,7 +37,7 @@ public void drawFigure(Graphics graphics) {
         bounds.height--;
         
         // Set line width here so that the whole figure is constrained, otherwise SVG graphics will have overspill
-        setLineWidth(graphics, 1, bounds);
+        setLineWidth(graphics, bounds);
 
         graphics.setAlpha(getAlpha());
 
diff --git a/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/diagram/DiagramImageFigure.java b/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/diagram/DiagramImageFigure.java
index 1b77dedb9..5e1671867 100644
--- a/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/diagram/DiagramImageFigure.java
+++ b/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/diagram/DiagramImageFigure.java
@@ -103,7 +103,7 @@ protected void paintFigure(Graphics graphics) {
         bounds.height--;
         
         // Set line width here so that the whole figure is constrained, otherwise SVG graphics will have overspill
-        setLineWidth(graphics, 1, bounds);
+        setLineWidth(graphics, bounds);
         
         if(fImage != null) {
             // Faster but no transparency
diff --git a/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/diagram/GroupFigure.java b/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/diagram/GroupFigure.java
index 9a35ed882..c62f82e10 100644
--- a/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/diagram/GroupFigure.java
+++ b/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/diagram/GroupFigure.java
@@ -55,7 +55,7 @@ protected void drawFigure(Graphics graphics) {
         bounds.height--;
         
         // Set line width here so that the whole figure is constrained, otherwise SVG graphics will have overspill
-        setLineWidth(graphics, 1, bounds);
+        setLineWidth(graphics, bounds);
         
         graphics.setAlpha(getAlpha());
         
diff --git a/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/diagram/NoteFigure.java b/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/diagram/NoteFigure.java
index 163e3fedb..56b54e9c0 100644
--- a/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/diagram/NoteFigure.java
+++ b/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/diagram/NoteFigure.java
@@ -115,7 +115,7 @@ protected void paintFigure(Graphics graphics) {
         
         // Set line width here so that the whole figure is constrained, otherwise SVG graphics will have overspill
         if(getDiagramModelObject().getBorderType() != IDiagramModelNote.BORDER_NONE) {
-            setLineWidth(graphics, 1, bounds);
+            setLineWidth(graphics, bounds);
         }
         
         // Fill
diff --git a/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/AbstractMotivationFigure.java b/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/AbstractMotivationFigure.java
index 93ab5a4ec..cef3eb625 100644
--- a/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/AbstractMotivationFigure.java
+++ b/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/AbstractMotivationFigure.java
@@ -43,7 +43,7 @@ protected void drawFigure(Graphics graphics) {
         bounds.height--;
         
         // Set line width here so that the whole figure is constrained, otherwise SVG graphics will have overspill
-        setLineWidth(graphics, 1, bounds);
+        setLineWidth(graphics, bounds);
        
         PointList points = new PointList();
         points.addPoint(bounds.x + FLANGE, bounds.y);
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 ddbc1fa85..87811e814 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
@@ -50,7 +50,7 @@ public void drawFigure(Graphics graphics) {
         bounds.height--;
         
         // Set line width here so that the whole figure is constrained, otherwise SVG graphics will have overspill
-        setLineWidth(graphics, 1, bounds);
+        setLineWidth(graphics, bounds);
         
         if(!isEnabled()) {
             setDisabledState(graphics);
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 62251ddd6..2f65eefa7 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
@@ -51,7 +51,7 @@ public void drawFigure(Graphics graphics) {
         rect.height--;
         
         // Set line width here so that the whole figure is constrained, otherwise SVG graphics will have overspill
-        setLineWidth(graphics, 1, rect);
+        setLineWidth(graphics, rect);
         
         if(!isEnabled()) {
             setDisabledState(graphics);
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 e63c4c54e..0c6ca395c 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
@@ -40,7 +40,7 @@ protected void drawFigure(Graphics graphics) {
         Rectangle imageBounds = rect.getCopy();
         
         // Set line width here so that the whole figure is constrained, otherwise SVG graphics will have overspill
-        setLineWidth(graphics, 1, rect);
+        setLineWidth(graphics, rect);
         
         setFigurePositionFromTextPosition(rect);
 
diff --git a/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/BoxFigureDelegate.java b/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/BoxFigureDelegate.java
index 00bce8031..0d1df3de7 100644
--- a/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/BoxFigureDelegate.java
+++ b/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/BoxFigureDelegate.java
@@ -40,7 +40,7 @@ public void drawFigure(Graphics graphics) {
         bounds.height--;
         
         // Set line width here so that the whole figure is consttained, otherwise SVG graphics will have overspill
-        setLineWidth(graphics, 1, bounds);
+        setLineWidth(graphics, bounds);
 
         graphics.setAlpha(getAlpha());
         
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 ef5f040c7..92069c206 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
@@ -48,7 +48,7 @@ protected void drawFigure(Graphics graphics) {
         Rectangle imageBounds = rect.getCopy();
         
         // Set line width here so that the whole figure is constrained, otherwise SVG graphics will have overspill
-        setLineWidth(graphics, 1, rect);
+        setLineWidth(graphics, rect);
         
         setFigurePositionFromTextPosition(rect, 2/3.0);
         
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 c1b455012..997d551e4 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
@@ -47,7 +47,7 @@ protected void drawFigure(Graphics graphics) {
         Rectangle imageBounds = rect.getCopy();
         
         // Set line width here so that the whole figure is constrained, otherwise SVG graphics will have overspill
-        setLineWidth(graphics, 1, rect);
+        setLineWidth(graphics, rect);
         
         setFigurePositionFromTextPosition(rect);
         
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 1cebcab3c..592d77821 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
@@ -47,7 +47,7 @@ protected void drawFigure(Graphics graphics) {
         Rectangle imageBounds = rect.getCopy();
         
         // Set line width here so that the whole figure is constrained, otherwise SVG graphics will have overspill
-        setLineWidth(graphics, 1, rect);
+        setLineWidth(graphics, rect);
         
         setFigurePositionFromTextPosition(rect, 1.5); // Should match 'diameter'
         
diff --git a/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/ContractFigure.java b/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/ContractFigure.java
index d3fd4df6a..7654eae96 100644
--- a/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/ContractFigure.java
+++ b/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/ContractFigure.java
@@ -40,7 +40,7 @@ public void drawFigure(Graphics graphics) {
             bounds.height--;
             
             // Set line width here so that the whole figure is constrained, otherwise SVG graphics will have overspill
-            setLineWidth(graphics, 1, bounds);
+            setLineWidth(graphics, bounds);
 
             graphics.setAlpha(getAlpha());
             
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 f25ae0cec..bcf6bd7fe 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
@@ -49,7 +49,7 @@ protected void drawFigure(Graphics graphics) {
         Rectangle imageBounds = rect.getCopy();
         
         // Set line width here so that the whole figure is constrained, otherwise SVG graphics will have overspill
-        setLineWidth(graphics, 1, rect);
+        setLineWidth(graphics, rect);
         
         setFigurePositionFromTextPosition(rect, 1.24); // Should match '3.1 / 2.5' (values used in getRadius() and getCenter())
         
diff --git a/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/CylinderFigureDelegate.java b/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/CylinderFigureDelegate.java
index 1bbfdc85b..126cbc9dc 100644
--- a/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/CylinderFigureDelegate.java
+++ b/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/CylinderFigureDelegate.java
@@ -37,7 +37,7 @@ public void drawFigure(Graphics graphics) {
         rect.height--;
         
         // Set line width here so that the whole figure is constrained, otherwise SVG graphics will have overspill
-        setLineWidth(graphics, 1, rect);
+        setLineWidth(graphics, rect);
         
         if(!isEnabled()) {
             setDisabledState(graphics);
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 08bd5044d..ae546d751 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
@@ -48,8 +48,7 @@ protected void drawFigure(Graphics graphics) {
         bounds.height--;
         
         // Set line width here so that the whole figure is constrained, otherwise SVG graphics will have overspill
-        int lineWidth = 1;
-        setLineWidth(graphics, lineWidth, bounds);
+        setLineWidth(graphics, bounds);
         
         graphics.setAlpha(getAlpha());
         
@@ -57,7 +56,7 @@ protected void drawFigure(Graphics graphics) {
             setDisabledState(graphics);
         }
         
-        Path path = getFigurePath(8, bounds, (float)lineWidth / 2);
+        Path path = getFigurePath(8, bounds, (float)getDiagramModelObject().getLineWidth() / 2);
         
         // Main Fill
         graphics.setBackgroundColor(getFillColor());
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 d3240e4dd..ec134d3c1 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
@@ -49,7 +49,7 @@ public void drawFigure(Graphics graphics) {
         bounds.height--;
         
         // Set line width here so that the whole figure is constrained, otherwise SVG graphics will have overspill
-        setLineWidth(graphics, 1, bounds);
+        setLineWidth(graphics, bounds);
         
         int height_indent = bounds.height / 6;
         
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 de0c0f774..44a6f9016 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
@@ -51,7 +51,7 @@ protected void drawFigure(Graphics graphics) {
         Rectangle imageBounds = rect.getCopy();
         
         // Set line width here so that the whole figure is constrained, otherwise SVG graphics will have overspill
-        setLineWidth(graphics, 1, rect);
+        setLineWidth(graphics, rect);
         
         setFigurePositionFromTextPosition(rect);
         
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 b6dcc8d21..de879f809 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
@@ -48,7 +48,7 @@ public void drawFigure(Graphics graphics) {
         bounds.height--;
 
         // Set line width here so that the whole figure is constrained, otherwise SVG graphics will have overspill
-        setLineWidth(graphics, 1, bounds);
+        setLineWidth(graphics, bounds);
         
         int indent = Math.min(bounds.height / 3, bounds.width / 3);
         int centre_y = bounds.y + bounds.height / 2 - 1;
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 060333520..729e8c747 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
@@ -48,7 +48,7 @@ protected void drawFigure(Graphics graphics) {
         Rectangle imageBounds = rect.getCopy();
         
         // Set line width here so that the whole figure is constrained, otherwise SVG graphics will have overspill
-        setLineWidth(graphics, 1, rect);
+        setLineWidth(graphics, rect);
         
         setFigurePositionFromTextPosition(rect);
         
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 05b9a930e..3e113f1e4 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
@@ -54,7 +54,7 @@ protected void drawFigure(Graphics graphics) {
         rect.height--;
         
         // Set line width here so that the whole figure is constrained, otherwise SVG graphics will have overspill
-        setLineWidth(graphics, 1, rect);
+        setLineWidth(graphics, rect);
         
         if(!isEnabled()) {
             setDisabledState(graphics);
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 742e41584..ded12e150 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
@@ -47,7 +47,7 @@ protected void drawFigure(Graphics graphics) {
         Rectangle imageBounds = rect.getCopy();
         
         // Set line width here so that the whole figure is constrained, otherwise SVG graphics will have overspill
-        setLineWidth(graphics, 1, rect);
+        setLineWidth(graphics, rect);
         
         setFigurePositionFromTextPosition(rect, 5/3.0); // Should match 'widthFraction' formula
         
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 90de24c39..79f4f2168 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
@@ -39,7 +39,7 @@ protected void drawFigure(Graphics graphics) {
         Rectangle imageBounds = rect.getCopy();
         
         // Set line width here so that the whole figure is constrained, otherwise SVG graphics will have overspill
-        setLineWidth(graphics, 1, rect);
+        setLineWidth(graphics, rect);
         
         setFigurePositionFromTextPosition(rect);
 
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 5e4728c32..f0f3cb9d3 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
@@ -59,7 +59,7 @@ protected void drawFigure(Graphics graphics) {
         }
         
         // Set line width here so that the whole figure is constrained, otherwise SVG graphics will have overspill
-        setLineWidth(graphics, 1, bounds);
+        setLineWidth(graphics, bounds);
 
         // Scale line dashes below 1.0
         double scale = Math.min(FigureUtils.getGraphicsScale(graphics), 1.0);
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 b0c0c06bf..f13ca474d 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
@@ -51,7 +51,7 @@ protected void drawFigure(Graphics graphics) {
         Rectangle imageBounds = rect.getCopy();
         
         // Set line width here so that the whole figure is constrained, otherwise SVG graphics will have overspill
-        setLineWidth(graphics, 1, rect);
+        setLineWidth(graphics, rect);
         
         setFigurePositionFromTextPosition(rect, 1 / 0.86); // Should match 'FRACTION' defined in getFigurePath()
         
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 89a6d41e3..da439c83c 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
@@ -47,7 +47,7 @@ protected void drawFigure(Graphics graphics) {
         Rectangle imageBounds = rect.getCopy();
         
         // Set line width here so that the whole figure is constrained, otherwise SVG graphics will have overspill
-        setLineWidth(graphics, 1, rect);
+        setLineWidth(graphics, rect);
         
         setFigurePositionFromTextPosition(rect);
         
diff --git a/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/JunctionFigure.java b/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/JunctionFigure.java
index 9585e965c..b1107e5fb 100644
--- a/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/JunctionFigure.java
+++ b/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/JunctionFigure.java
@@ -52,7 +52,7 @@ public void paintFigure(Graphics graphics) {
                 break;
 
             case IJunction.OR_JUNCTION_TYPE:
-                setLineWidth(graphics, 1, bounds);
+                setLineWidth(graphics, bounds);
                 graphics.setForegroundColor(getFillColor());
                 graphics.drawOval(bounds);
                 break;
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 2854fe27b..eb9471968 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
@@ -47,7 +47,7 @@ protected void drawFigure(Graphics graphics) {
         Rectangle imageBounds = rect.getCopy();
         
         // Set line width here so that the whole figure is constrained, otherwise SVG graphics will have overspill
-        setLineWidth(graphics, 1, rect);
+        setLineWidth(graphics, rect);
         
         setFigurePositionFromTextPosition(rect);
         
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 68d2b09a4..1a0a22193 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
@@ -49,7 +49,7 @@ protected void drawFigure(Graphics graphics) {
         Rectangle imageBounds = rect.getCopy();
         
         // Set line width here so that the whole figure is constrained, otherwise SVG graphics will have overspill
-        setLineWidth(graphics, 1, rect);
+        setLineWidth(graphics, rect);
         
         setFigurePositionFromTextPosition(rect, 10/9.0); // Should match 'figureHeight'
         
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 b711673b0..d1fa361af 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
@@ -37,7 +37,7 @@ public void drawFigure(Graphics graphics) {
         Rectangle bounds = getBounds().getCopy();
         
         // Set line width here so that the whole figure is constrained, otherwise SVG graphics will have overspill
-        setLineWidth(graphics, 1, bounds);
+        setLineWidth(graphics, bounds);
         
         // The following is a not so awful code to draw a cloud...
         
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 cc1c4ce12..f1b18e62d 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
@@ -46,7 +46,7 @@ public void drawFigure(Graphics graphics) {
             bounds.height--;
             
             // Set line width here so that the whole figure is constrained, otherwise SVG graphics will have overspill
-            setLineWidth(graphics, 1, bounds);
+            setLineWidth(graphics, bounds);
 
             graphics.setAlpha(getAlpha());
             
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 45dad42dd..db91a26b8 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
@@ -40,7 +40,7 @@ protected void drawFigure(Graphics graphics) {
         Rectangle imageBounds = rect.getCopy();
         
         // Set line width here so that the whole figure is constrained, otherwise SVG graphics will have overspill
-        setLineWidth(graphics, 1, rect);
+        setLineWidth(graphics, rect);
         
         setFigurePositionFromTextPosition(rect);
 
diff --git a/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/ParallelogramFigureDelegate.java b/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/ParallelogramFigureDelegate.java
index 64c33667a..3959f826c 100644
--- a/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/ParallelogramFigureDelegate.java
+++ b/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/ParallelogramFigureDelegate.java
@@ -43,7 +43,7 @@ public void drawFigure(Graphics graphics) {
         bounds.height--;
         
         // Set line width here so that the whole figure is constrained, otherwise SVG graphics will have overspill
-        setLineWidth(graphics, 1, bounds);
+        setLineWidth(graphics, bounds);
 
         PointList points = new PointList();
         points.addPoint(bounds.x + FLANGE, bounds.y);
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 e35320df6..965dedf6d 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
@@ -39,7 +39,7 @@ protected void drawFigure(Graphics graphics) {
         Rectangle imageBounds = rect.getCopy();
         
         // Set line width here so that the whole figure is constrained, otherwise SVG graphics will have overspill
-        setLineWidth(graphics, 1, rect);
+        setLineWidth(graphics, rect);
 
         setFigurePositionFromTextPosition(rect);
         
diff --git a/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/ProcessFigureDelegate.java b/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/ProcessFigureDelegate.java
index 2b05a12f8..e15d8910b 100644
--- a/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/ProcessFigureDelegate.java
+++ b/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/ProcessFigureDelegate.java
@@ -46,8 +46,7 @@ public void drawFigure(Graphics graphics) {
         bounds.height--;
         
         // Set line width here so that the whole figure is constrained, otherwise SVG graphics will have overspill
-        int lineWidth = 1;
-        setLineWidth(graphics, lineWidth, bounds);
+        setLineWidth(graphics, bounds);
         
         Pattern gradient = applyGradientPattern(graphics, bounds);
 
@@ -57,7 +56,7 @@ public void drawFigure(Graphics graphics) {
         float y1 = bounds.y + (bounds.height / 5);
         float y2 = bounds.y + bounds.height - (bounds.height / 5);
         
-        float lineOffset = (float)lineWidth / 2;
+        float lineOffset = (float)getOwner().getDiagramModelObject().getLineWidth() / 2;
 
         path.moveTo(bounds.x, y1);
         path.lineTo(x1, y1);
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 56af8cf0e..c37429625 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
@@ -48,7 +48,7 @@ public void drawFigure(Graphics graphics) {
                 bounds.height--;
 
                 // Set line width here so that the whole figure is constrained, otherwise SVG graphics will have overspill
-                setLineWidth(graphics, 1, bounds);
+                setLineWidth(graphics, bounds);
 
                 graphics.setAlpha(getAlpha());
                 
diff --git a/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/RepresentationFigure.java b/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/RepresentationFigure.java
index a342c1a3e..5478435d1 100644
--- a/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/RepresentationFigure.java
+++ b/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/RepresentationFigure.java
@@ -44,8 +44,7 @@ public void drawFigure(Graphics graphics) {
         bounds.height--;
         
         // Set line width here so that the whole figure is constrained, otherwise SVG graphics will have overspill
-        int lineWidth = 1;
-        setLineWidth(graphics, lineWidth, bounds);
+        setLineWidth(graphics, bounds);
 
         graphics.setAlpha(getAlpha());
         
@@ -53,7 +52,7 @@ public void drawFigure(Graphics graphics) {
             setDisabledState(graphics);
         }
         
-        Path path = getFigurePath(6, bounds, (float)lineWidth / 2);
+        Path path = getFigurePath(6, bounds, (float)getDiagramModelObject().getLineWidth() / 2);
         
         // Main Fill
         graphics.setBackgroundColor(getFillColor());
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 3641ec994..738ef1133 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
@@ -46,7 +46,7 @@ protected void drawFigure(Graphics graphics) {
         rect.height--;
         
         // Set line width here so that the whole figure is constrained, otherwise SVG graphics will have overspill
-        setLineWidth(graphics, 1, rect);
+        setLineWidth(graphics, rect);
         
         if(!isEnabled()) {
             setDisabledState(graphics);
diff --git a/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/ServiceFigureDelegate.java b/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/ServiceFigureDelegate.java
index 69574ea34..971ddab40 100644
--- a/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/ServiceFigureDelegate.java
+++ b/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/ServiceFigureDelegate.java
@@ -40,7 +40,7 @@ public void drawFigure(Graphics graphics) {
         bounds.height--;
 
         // Set line width here so that the whole figure is constrained, otherwise SVG graphics will have overspill
-        setLineWidth(graphics, 1, bounds);
+        setLineWidth(graphics, bounds);
 
         Dimension arc = getArc();
         
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 e75e4bee0..d737e6d1a 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
@@ -50,7 +50,7 @@ protected void drawFigure(Graphics graphics) {
         Rectangle imageBounds = rect.getCopy();
         
         // Set line width here so that the whole figure is constrained, otherwise SVG graphics will have overspill
-        setLineWidth(graphics, 1, rect);
+        setLineWidth(graphics, rect);
 
         setFigurePositionFromTextPosition(rect);
         
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 f1f42e8cd..0e84ca7d1 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
@@ -42,7 +42,7 @@ public void drawFigure(Graphics graphics) {
         bounds.height--;
         
         // Set line width here so that the whole figure is constrained, otherwise SVG graphics will have overspill
-        setLineWidth(graphics, 1, bounds);
+        setLineWidth(graphics, bounds);
         
         graphics.setAlpha(getAlpha());
         
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 4ca441b2e..18c827e1b 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
@@ -48,7 +48,7 @@ protected void drawFigure(Graphics graphics) {
         bounds.height--;
 
         // Set line width here so that the whole figure is constrained, otherwise SVG graphics will have overspill
-        setLineWidth(graphics, 1, bounds);
+        setLineWidth(graphics, bounds);
 
         int indent = Math.min(bounds.height / 2, bounds.width / 2);
         int centre_y = bounds.y + bounds.height / 2;
diff --git a/com.archimatetool.editor/src/com/archimatetool/editor/diagram/sketch/figures/StickyFigure.java b/com.archimatetool.editor/src/com/archimatetool/editor/diagram/sketch/figures/StickyFigure.java
index 68d285248..2831535ed 100644
--- a/com.archimatetool.editor/src/com/archimatetool/editor/diagram/sketch/figures/StickyFigure.java
+++ b/com.archimatetool.editor/src/com/archimatetool/editor/diagram/sketch/figures/StickyFigure.java
@@ -49,7 +49,7 @@ protected void drawFigure(Graphics graphics) {
         bounds.height--;
         
         // Set line width here so that the whole figure is constrained, otherwise SVG graphics will have overspill
-        setLineWidth(graphics, 1, bounds);
+        setLineWidth(graphics, bounds);
 
         graphics.setBackgroundColor(getFillColor());
 
diff --git a/com.archimatetool.editor/src/com/archimatetool/editor/propertysections/LineWidthSection.java b/com.archimatetool.editor/src/com/archimatetool/editor/propertysections/LineWidthSection.java
new file mode 100644
index 000000000..70b2690d1
--- /dev/null
+++ b/com.archimatetool.editor/src/com/archimatetool/editor/propertysections/LineWidthSection.java
@@ -0,0 +1,133 @@
+/**
+ * This program and the accompanying materials
+ * are made available under the terms of the License
+ * which accompanies this distribution in the file LICENSE.txt
+ */
+package com.archimatetool.editor.propertysections;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.gef.commands.Command;
+import org.eclipse.gef.commands.CompoundCommand;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.widgets.Combo;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.ui.PlatformUI;
+
+import com.archimatetool.editor.diagram.commands.LineWidthCommand;
+import com.archimatetool.model.IArchimatePackage;
+import com.archimatetool.model.IDiagramModelObject;
+import com.archimatetool.model.ILineObject;
+
+
+
+/**
+ * Line Width Section
+ * 
+ * @author Phillip Beauvoir
+ */
+public class LineWidthSection extends AbstractECorePropertySection {
+    
+    private static final String HELP_ID = "com.archimatetool.help.elementPropertySection"; //$NON-NLS-1$
+
+    /**
+     * Filter to show or reject this section depending on input value
+     */
+    public static class Filter extends ObjectFilter {
+        @Override
+        public boolean isRequiredType(Object object) {
+            return object instanceof IDiagramModelObject;
+        }
+
+        @Override
+        public Class<?> getAdaptableType() {
+            return IDiagramModelObject.class;
+        }
+    }
+
+    private Combo fComboLineWidth;
+    
+    public static final String[] comboLineWidthItems = {
+            Messages.LineWidthSection_1,
+            Messages.LineWidthSection_2,
+            Messages.LineWidthSection_3,
+            Messages.LineWidthSection_4
+    };
+    
+    @Override
+    protected void createControls(Composite parent) {
+        createLineWidthComboControl(parent);
+        
+        // Help ID
+        PlatformUI.getWorkbench().getHelpSystem().setHelp(parent, HELP_ID);
+    }
+    
+    private void createLineWidthComboControl(Composite parent) {
+        createLabel(parent, Messages.LineWidthSection_0, ITabbedLayoutConstants.STANDARD_LABEL_WIDTH, SWT.CENTER);
+        
+        fComboLineWidth = new Combo(parent, SWT.READ_ONLY);
+        fComboLineWidth.setItems(comboLineWidthItems);
+        GridData gd = new GridData(SWT.NONE, SWT.NONE, true, false);
+        gd.minimumWidth = ITabbedLayoutConstants.COMBO_WIDTH;
+        fComboLineWidth.setLayoutData(gd);
+        fComboLineWidth.addSelectionListener(new SelectionAdapter() {
+            @Override
+            public void widgetSelected(SelectionEvent e) {
+                CompoundCommand result = new CompoundCommand();
+
+                for(EObject connection : getEObjects()) {
+                    if(isAlive(connection)) {
+                        Command cmd = new LineWidthCommand((ILineObject)connection, fComboLineWidth.getSelectionIndex() + 1);
+                        if(cmd.canExecute()) {
+                            result.add(cmd);
+                        }
+                    }
+                }
+
+                executeCommand(result.unwrap());
+            }
+        });
+    }
+    
+    @Override
+    protected void notifyChanged(Notification msg) {
+        if(msg.getNotifier() == getFirstSelectedObject()) {
+            Object feature = msg.getFeature();
+            
+            if(feature == IArchimatePackage.Literals.LINE_OBJECT__LINE_WIDTH) {
+                refreshLineWidthCombo();
+            }
+            else if(feature == IArchimatePackage.Literals.LOCKABLE__LOCKED) {
+                update();
+            }
+        }
+    }
+
+    @Override
+    protected void update() {
+        refreshLineWidthCombo();
+    }
+    
+    protected void refreshLineWidthCombo() {
+        if(fIsExecutingCommand) {
+            return; 
+        }
+        
+        IDiagramModelObject firstSelected = (IDiagramModelObject)getFirstSelectedObject();
+        
+        int lineWidth = firstSelected.getLineWidth();
+        lineWidth = lineWidth < 1 ? 1 : lineWidth > 4 ? 4 : lineWidth;
+        
+        fComboLineWidth.select(lineWidth - 1);
+        
+        fComboLineWidth.setEnabled(!isLocked(firstSelected));
+    }
+    
+    @Override
+    protected IObjectFilter getFilter() {
+        return new Filter();
+    }
+}
diff --git a/com.archimatetool.editor/src/com/archimatetool/editor/propertysections/Messages.java b/com.archimatetool.editor/src/com/archimatetool/editor/propertysections/Messages.java
index b64945860..46112a3fc 100644
--- a/com.archimatetool.editor/src/com/archimatetool/editor/propertysections/Messages.java
+++ b/com.archimatetool.editor/src/com/archimatetool/editor/propertysections/Messages.java
@@ -247,6 +247,16 @@ public class Messages extends NLS {
 
     public static String LineColorSection_2;
 
+    public static String LineWidthSection_0;
+
+    public static String LineWidthSection_1;
+
+    public static String LineWidthSection_2;
+
+    public static String LineWidthSection_3;
+
+    public static String LineWidthSection_4;
+
     public static String LockedSection_0;
 
     public static String NameSection_0;
diff --git a/com.archimatetool.editor/src/com/archimatetool/editor/propertysections/messages.properties b/com.archimatetool.editor/src/com/archimatetool/editor/propertysections/messages.properties
index b82428cd4..1c6a578d3 100644
--- a/com.archimatetool.editor/src/com/archimatetool/editor/propertysections/messages.properties
+++ b/com.archimatetool.editor/src/com/archimatetool/editor/propertysections/messages.properties
@@ -129,6 +129,11 @@ LabelRendererSection_2=Set expression
 LineColorSection_0=Line Colour:
 LineColorSection_1=Default
 LineColorSection_2=Enable in Preferences
+LineWidthSection_0=Line Width:
+LineWidthSection_1=Normal
+LineWidthSection_2=Medium
+LineWidthSection_3=Heavy
+LineWidthSection_4=Extra Heavy
 
 LockedSection_0=Locked:
 
diff --git a/com.archimatetool.help/help/Images/properties_canvas_block3.png b/com.archimatetool.help/help/Images/properties_canvas_block3.png
index bae981133..bf135c4a6 100755
Binary files a/com.archimatetool.help/help/Images/properties_canvas_block3.png and b/com.archimatetool.help/help/Images/properties_canvas_block3.png differ
diff --git a/com.archimatetool.help/help/Images/properties_canvas_image2.png b/com.archimatetool.help/help/Images/properties_canvas_image2.png
index 76d54f8e8..910863bae 100755
Binary files a/com.archimatetool.help/help/Images/properties_canvas_image2.png and b/com.archimatetool.help/help/Images/properties_canvas_image2.png differ
diff --git a/com.archimatetool.help/help/Images/properties_canvas_sticky2.png b/com.archimatetool.help/help/Images/properties_canvas_sticky2.png
index fd2af7329..d1cb17673 100755
Binary files a/com.archimatetool.help/help/Images/properties_canvas_sticky2.png and b/com.archimatetool.help/help/Images/properties_canvas_sticky2.png differ
diff --git a/com.archimatetool.help/help/Images/properties_element3.png b/com.archimatetool.help/help/Images/properties_element3.png
index a56c4315b..209a9d21a 100755
Binary files a/com.archimatetool.help/help/Images/properties_element3.png and b/com.archimatetool.help/help/Images/properties_element3.png differ
diff --git a/com.archimatetool.help/help/Images/properties_group2.png b/com.archimatetool.help/help/Images/properties_group2.png
index a2d6be751..074616a95 100755
Binary files a/com.archimatetool.help/help/Images/properties_group2.png and b/com.archimatetool.help/help/Images/properties_group2.png differ
diff --git a/com.archimatetool.help/help/Images/properties_note2.png b/com.archimatetool.help/help/Images/properties_note2.png
index 9979c8c05..6db7b6de3 100755
Binary files a/com.archimatetool.help/help/Images/properties_note2.png and b/com.archimatetool.help/help/Images/properties_note2.png differ
diff --git a/com.archimatetool.help/help/Images/properties_viewref2.png b/com.archimatetool.help/help/Images/properties_viewref2.png
index 5cf3774d0..06003418c 100755
Binary files a/com.archimatetool.help/help/Images/properties_viewref2.png and b/com.archimatetool.help/help/Images/properties_viewref2.png differ
diff --git a/com.archimatetool.help/help/Text/properties_canvas_block.html b/com.archimatetool.help/help/Text/properties_canvas_block.html
index 0a66a2e25..26b7c04d2 100644
--- a/com.archimatetool.help/help/Text/properties_canvas_block.html
+++ b/com.archimatetool.help/help/Text/properties_canvas_block.html
@@ -78,6 +78,10 @@ <h2>Canvas Block</h2>
         <td><strong>Border colour:</strong></td>
         <td>Sets the colour of the border used for the selected object. The "None" button removes the border from the object.</td>
       </tr>
+      <tr>
+        <td><strong>Line Width:</strong></td>
+        <td>Sets the width of the border line. Options are "Normal", "Medium", "Heavy" and "Extra Heavy".</td>
+      </tr>
       <tr>
         <td><strong>Text Alignment:</strong></td>
         <td>Align text in the selected object to Left, Centred or Right.</td>
diff --git a/com.archimatetool.help/help/Text/properties_canvas_image.html b/com.archimatetool.help/help/Text/properties_canvas_image.html
index 844bacd6d..9c080271a 100644
--- a/com.archimatetool.help/help/Text/properties_canvas_image.html
+++ b/com.archimatetool.help/help/Text/properties_canvas_image.html
@@ -61,6 +61,10 @@ <h2>Canvas Image</h2>
         <td><strong>Border colour:</strong></td>
         <td>Sets the colour of the border used for the selected object. The "None" button removes the border from the object.</td>
       </tr>
+      <tr>
+        <td><strong>Line Width:</strong></td>
+        <td>Sets the width of the border line. Options are "Normal", "Medium", "Heavy" and "Extra Heavy".</td>
+      </tr>
       <tr>
         <td><strong>Fill Opacity:</strong></td>
         <td>Set the fill opacity of the figure. Range from 0-255.</td>
diff --git a/com.archimatetool.help/help/Text/properties_canvas_sticky.html b/com.archimatetool.help/help/Text/properties_canvas_sticky.html
index a43c8736a..27d70827c 100644
--- a/com.archimatetool.help/help/Text/properties_canvas_sticky.html
+++ b/com.archimatetool.help/help/Text/properties_canvas_sticky.html
@@ -64,6 +64,10 @@ <h2>Canvas Sticky</h2>
         <td><strong>Border colour:</strong></td>
         <td>Sets the colour of the border used for the selected object. The "None" button removes the border from the object.</td>
       </tr>
+      <tr>
+        <td><strong>Line Width:</strong></td>
+        <td>Sets the width of the border line. Options are "Normal", "Medium", "Heavy" and "Extra Heavy".</td>
+      </tr>
       <tr>
         <td><strong>Text Alignment:</strong></td>
         <td>Align text in the selected object to Left, Centred or Right.</td>
diff --git a/com.archimatetool.help/help/Text/properties_element_appearance.html b/com.archimatetool.help/help/Text/properties_element_appearance.html
index ac008fd19..7ae3e3841 100644
--- a/com.archimatetool.help/help/Text/properties_element_appearance.html
+++ b/com.archimatetool.help/help/Text/properties_element_appearance.html
@@ -32,6 +32,10 @@ <h2>Element Appearance Properties</h2>
         <td><strong>Line colour:</strong></td>
         <td>Sets the colour of the line used to draw the selected element. The "Default" button sets the line colour to the default setting. If this is disabled it is because line colours are derived from the element's fill colour, as set in Preferences.</td>
       </tr>
+      <tr>
+        <td><strong>Line Width:</strong></td>
+        <td>Sets the width of the line used to draw the selected element. Options are "Normal", "Medium", "Heavy" and "Extra Heavy".</td>
+      </tr>
       <tr>
         <td><strong>Icon colour:</strong></td>
         <td>Sets the colour of the small ArchiMate icon in figures. The "Default" button sets the line colour to the default setting.</td>
diff --git a/com.archimatetool.help/help/Text/properties_group.html b/com.archimatetool.help/help/Text/properties_group.html
index afd518d62..2c56ae7b3 100644
--- a/com.archimatetool.help/help/Text/properties_group.html
+++ b/com.archimatetool.help/help/Text/properties_group.html
@@ -53,6 +53,10 @@ <h2>Group Properties</h2>
         <td><strong>Line colour:</strong></td>
         <td>Sets the colour of the line used to draw the Group. The "Default" button sets the line colour to the default setting. If this is disabled it is because line colours are derived from the object's fill colour, as set in Preferences.</td>
       </tr>
+      <tr>
+        <td><strong>Line Width:</strong></td>
+        <td>Sets the width of the line used to draw the Group. Options are "Normal", "Medium", "Heavy" and "Extra Heavy".</td>
+      </tr>
       <tr>
         <td><strong>Gradient:</strong></td>
         <td>Sets the direction used to draw the gradient fill of the selected element. Settings are "None", "Top", Left", "Right" and "Bottom". Note - gradients will not show when a diagram is exported in SVG image format.</td>
diff --git a/com.archimatetool.help/help/Text/properties_note.html b/com.archimatetool.help/help/Text/properties_note.html
index 38968601b..a20bb4546 100644
--- a/com.archimatetool.help/help/Text/properties_note.html
+++ b/com.archimatetool.help/help/Text/properties_note.html
@@ -48,6 +48,10 @@ <h2>Note Properties</h2>
         <td><strong>Line colour:</strong></td>
         <td>Sets the colour of the line used to draw the selected object. The "Default" button sets the line colour to the default setting. If this is disabled it is because line colours are derived from the object's fill colour, as set in Preferences.</td>
       </tr>
+      <tr>
+        <td><strong>Line Width:</strong></td>
+        <td>Sets the width of the line used to draw the selected object. Options are "Normal", "Medium", "Heavy" and "Extra Heavy".</td>
+      </tr>
       <tr>
         <td><strong>Gradient:</strong></td>
         <td>Sets the direction used to draw the gradient fill of the selected element. Settings are "None", "Top", Left", "Right" and "Bottom". Note - gradients will not show when a diagram is exported in SVG image format.</td>
diff --git a/com.archimatetool.help/help/Text/properties_viewref.html b/com.archimatetool.help/help/Text/properties_viewref.html
index 92e5202ea..e8c6121ac 100644
--- a/com.archimatetool.help/help/Text/properties_viewref.html
+++ b/com.archimatetool.help/help/Text/properties_viewref.html
@@ -54,6 +54,10 @@ <h2>View Reference Properties</h2>
         <td><strong>Line colour:</strong></td>
         <td>Sets the colour of the line used to draw the selected object. The "Default" button sets the line colour to the default setting. If this is disabled it is because line colours are derived from the object's fill colour, as set in Preferences.</td>
       </tr>
+      <tr>
+        <td><strong>Line Width:</strong></td>
+        <td>Sets the width of the line used to draw the selected object. Options are "Normal", "Medium", "Heavy" and "Extra Heavy".</td>
+      </tr>
       <tr>
         <td><strong>Gradient:</strong></td>
         <td>Sets the direction used to draw the gradient fill of the selected element. Settings are "None", "Top", Left", "Right" and "Bottom". Note - gradients will not show when a diagram is exported in SVG image format.</td>