Index: Core/Components/src/Core.Components.Gis/Style/PointStyle.cs
===================================================================
diff -u -r87ac68e11e89dda424f6fe34e145ee901cdc4e5c -r9db03162dd78287d02807c92b35d7d967fac9c8a
--- Core/Components/src/Core.Components.Gis/Style/PointStyle.cs	(.../PointStyle.cs)	(revision 87ac68e11e89dda424f6fe34e145ee901cdc4e5c)
+++ Core/Components/src/Core.Components.Gis/Style/PointStyle.cs	(.../PointStyle.cs)	(revision 9db03162dd78287d02807c92b35d7d967fac9c8a)
@@ -35,25 +35,40 @@
         /// <param name="size">The size of the point.</param>
         /// <param name="symbol">The symbol of the point.</param>
         public PointStyle(Color color, int size, PointSymbol symbol)
+            : this(color, size, symbol, color, 1) {}
+
+        private PointStyle(Color color, int size, PointSymbol symbol, Color strokeColor, int strokeThickness)
         {
             Color = color;
             Size = size;
             Symbol = symbol;
+            StrokeColor = strokeColor;
+            StrokeThickness = strokeThickness;
         }
 
         /// <summary>
-        /// Gets the point color.
+        /// Gets or sets the point color.
         /// </summary>
         public Color Color { get; set; }
 
         /// <summary>
-        /// Gets the point size.
+        /// Gets or sets the point size.
         /// </summary>
-        public double Size { get; set; }
+        public int Size { get; set; }
 
         /// <summary>
-        /// Gets the point symbol.
+        /// Gets or sets the point symbol.
         /// </summary>
         public PointSymbol Symbol { get; set; }
+
+        /// <summary>
+        /// Gets or sets the stroke color.
+        /// </summary>
+        public Color StrokeColor { get; set; }
+
+        /// <summary>
+        /// Gets or sets the stroke thickness.
+        /// </summary>
+        public int StrokeThickness { get; set; }
     }
 }
\ No newline at end of file
Index: Core/Components/test/Core.Components.Gis.Test/Data/MapPointDataTest.cs
===================================================================
diff -u -r7fc5e21f72a83b37ad5e4daca553fca84fe140ab -r9db03162dd78287d02807c92b35d7d967fac9c8a
--- Core/Components/test/Core.Components.Gis.Test/Data/MapPointDataTest.cs	(.../MapPointDataTest.cs)	(revision 7fc5e21f72a83b37ad5e4daca553fca84fe140ab)
+++ Core/Components/test/Core.Components.Gis.Test/Data/MapPointDataTest.cs	(.../MapPointDataTest.cs)	(revision 9db03162dd78287d02807c92b35d7d967fac9c8a)
@@ -49,6 +49,8 @@
             Assert.AreEqual(Color.Black, data.Style.Color);
             Assert.AreEqual(2, data.Style.Size);
             Assert.AreEqual(PointSymbol.Square, data.Style.Symbol);
+            Assert.AreEqual(Color.Black, data.Style.StrokeColor);
+            Assert.AreEqual(1, data.Style.StrokeThickness);
         }
 
         [Test]
Index: Core/Components/test/Core.Components.Gis.Test/Style/PointStyleTest.cs
===================================================================
diff -u -r67284323e2785c651633d9c52049ba12a9c70e6a -r9db03162dd78287d02807c92b35d7d967fac9c8a
--- Core/Components/test/Core.Components.Gis.Test/Style/PointStyleTest.cs	(.../PointStyleTest.cs)	(revision 67284323e2785c651633d9c52049ba12a9c70e6a)
+++ Core/Components/test/Core.Components.Gis.Test/Style/PointStyleTest.cs	(.../PointStyleTest.cs)	(revision 9db03162dd78287d02807c92b35d7d967fac9c8a)
@@ -43,6 +43,8 @@
             Assert.AreEqual(color, pointStyle.Color);
             Assert.AreEqual(width, pointStyle.Size);
             Assert.AreEqual(style, pointStyle.Symbol);
+            Assert.AreEqual(color, pointStyle.StrokeColor);
+            Assert.AreEqual(1, pointStyle.StrokeThickness);
         }
     }
 }
\ No newline at end of file
Index: Core/Plugins/src/Core.Plugins.Map/PropertyClasses/MapPointDataProperties.cs
===================================================================
diff -u -r87ac68e11e89dda424f6fe34e145ee901cdc4e5c -r9db03162dd78287d02807c92b35d7d967fac9c8a
--- Core/Plugins/src/Core.Plugins.Map/PropertyClasses/MapPointDataProperties.cs	(.../MapPointDataProperties.cs)	(revision 87ac68e11e89dda424f6fe34e145ee901cdc4e5c)
+++ Core/Plugins/src/Core.Plugins.Map/PropertyClasses/MapPointDataProperties.cs	(.../MapPointDataProperties.cs)	(revision 9db03162dd78287d02807c92b35d7d967fac9c8a)
@@ -61,31 +61,43 @@
         [ResourcesCategory(typeof(Resources), nameof(Resources.Categories_Styling))]
         [ResourcesDisplayName(typeof(Resources), nameof(Resources.MapPointData_StrokeColor_DisplayName))]
         [ResourcesDescription(typeof(Resources), nameof(Resources.MapPointData_StrokeColor_Description))]
-        public string StrokeColor
+        [Editor(typeof(ColorEditor), typeof(UITypeEditor))]
+        [TypeConverter(typeof(MapColorConverter))]
+        public Color StrokeColor
         {
             get
             {
-                return data.Style.Color.ToString();
+                return data.Style.StrokeColor;
             }
+            set
+            {
+                data.Style.StrokeColor = value;
+                data.NotifyObservers();
+            }
         }
 
         [PropertyOrder(7)]
         [ResourcesCategory(typeof(Resources), nameof(Resources.Categories_Styling))]
         [ResourcesDisplayName(typeof(Resources), nameof(Resources.MapPointData_StrokeThickness_DisplayName))]
         [ResourcesDescription(typeof(Resources), nameof(Resources.MapPointData_StrokeThickness_Description))]
-        public double StrokeThickness
+        public int StrokeThickness
         {
             get
             {
-                return data.Style.Size;
+                return data.Style.StrokeThickness;
             }
+            set
+            {
+                data.Style.StrokeThickness = value;
+                data.NotifyObservers();
+            }
         }
 
         [PropertyOrder(8)]
         [ResourcesCategory(typeof(Resources), nameof(Resources.Categories_Styling))]
         [ResourcesDisplayName(typeof(Resources), nameof(Resources.MapPointData_Size_DisplayName))]
         [ResourcesDescription(typeof(Resources), nameof(Resources.MapPointData_Size_Description))]
-        public double Size
+        public int Size
         {
             get
             {
Index: Core/Plugins/test/Core.Plugins.Map.Test/PropertyClasses/MapPointDataPropertiesTest.cs
===================================================================
diff -u -r87ac68e11e89dda424f6fe34e145ee901cdc4e5c -r9db03162dd78287d02807c92b35d7d967fac9c8a
--- Core/Plugins/test/Core.Plugins.Map.Test/PropertyClasses/MapPointDataPropertiesTest.cs	(.../MapPointDataPropertiesTest.cs)	(revision 87ac68e11e89dda424f6fe34e145ee901cdc4e5c)
+++ Core/Plugins/test/Core.Plugins.Map.Test/PropertyClasses/MapPointDataPropertiesTest.cs	(.../MapPointDataPropertiesTest.cs)	(revision 9db03162dd78287d02807c92b35d7d967fac9c8a)
@@ -88,18 +88,17 @@
                                                                             "De kleur van de symbolen waarmee deze kaartlaag wordt weergegeven.");
 
             PropertyDescriptor strokeColorProperty = dynamicProperties[strokeColorPropertyIndex];
+            Assert.IsInstanceOf<MapColorConverter>(colorProperty.Converter);
             PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(strokeColorProperty,
                                                                             "Stijl",
                                                                             "Lijnkleur",
-                                                                            "De kleur van de lijn van de symbolen waarmee deze kaartlaag wordt weergegeven.",
-                                                                            true);
+                                                                            "De kleur van de lijn van de symbolen waarmee deze kaartlaag wordt weergegeven.");
 
             PropertyDescriptor strokeThicknessProperty = dynamicProperties[strokeThicknessPropertyIndex];
             PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(strokeThicknessProperty,
                                                                             "Stijl",
                                                                             "Lijndikte",
-                                                                            "De dikte van de lijn van de symbolen waarmee deze kaartlaag wordt weergegeven.",
-                                                                            true);
+                                                                            "De dikte van de lijn van de symbolen waarmee deze kaartlaag wordt weergegeven.");
 
             PropertyDescriptor sizeProperty = dynamicProperties[sizePropertyIndex];
             PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(sizeProperty,
@@ -135,8 +134,8 @@
             Assert.AreEqual(mapPointData.MetaData, properties.GetAvailableMetaDataAttributes());
 
             Assert.AreEqual(color, properties.Color);
-            Assert.AreEqual(color.ToString(), properties.StrokeColor);
-            Assert.AreEqual(size, properties.StrokeThickness);
+            Assert.AreEqual(color, properties.StrokeColor);
+            Assert.AreEqual(1, properties.StrokeThickness);
             Assert.AreEqual(size, properties.Size);
             Assert.AreEqual(symbol, properties.Symbol);
         }
@@ -145,7 +144,7 @@
         public void SetProperties_IndividualProperties_UpdateDataAndNotifyObservers()
         {
             // Setup
-            const int numberOfChangedProperties = 3;
+            const int numberOfChangedProperties = 5;
             var mocks = new MockRepository();
             var observerMock = mocks.StrictMock<IObserver>();
             observerMock.Expect(o => o.UpdateObserver()).Repeat.Times(numberOfChangedProperties);
@@ -161,19 +160,24 @@
             };
 
             Color newColor = Color.Blue;
-            const double newSize = 6;
-            PointSymbol newSymbol = PointSymbol.Diamond;
+            Color newStrokeColor = Color.Aquamarine;
+            const int newSize = 6;
+            const PointSymbol newSymbol = PointSymbol.Diamond;
+            const int newStrokeThickness = 4;
 
             // Call
             properties.Color = newColor;
             properties.Size = newSize;
             properties.Symbol = newSymbol;
+            properties.StrokeColor = newStrokeColor;
+            properties.StrokeThickness = newStrokeThickness;
 
-
             // Assert
             Assert.AreEqual(newColor, mapPointData.Style.Color);
             Assert.AreEqual(newSize, mapPointData.Style.Size);
             Assert.AreEqual(newSymbol, mapPointData.Style.Symbol);
+            Assert.AreEqual(newStrokeColor, mapPointData.Style.StrokeColor);
+            Assert.AreEqual(newStrokeThickness, mapPointData.Style.StrokeThickness);
             mocks.VerifyAll();
         }
     }