Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Controls/BoxedLabel.cs
===================================================================
diff -u
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Controls/BoxedLabel.cs	(revision 0)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Controls/BoxedLabel.cs	(revision 05aa333abfabb4cfdc3292f2ea0d4508aef20d28)
@@ -0,0 +1,45 @@
+// Copyright (C) Stichting Deltares 2017. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System.Drawing;
+using System.Windows.Forms;
+
+namespace Ringtoets.Common.Forms.Controls
+{
+    /// <summary>
+    /// Custom <see cref="Label"/> control with a border.
+    /// </summary>
+    public sealed class BoxedLabel : Label
+    {
+        /// <summary>
+        /// Creates a new instance of <see cref="BoxedLabel"/>.
+        /// </summary>
+        public BoxedLabel()
+        {
+            AutoSize = true;
+            BorderStyle = BorderStyle.FixedSingle;
+            Dock = DockStyle.Fill;
+            MinimumSize = new Size(50, 0);
+            Padding = new Padding(5, 0, 5, 0);
+            TextAlign = ContentAlignment.MiddleLeft;
+        }
+    }
+}
\ No newline at end of file
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Ringtoets.Common.Forms.csproj
===================================================================
diff -u -r4b5247bbd278f66bb4536a0c92beb667e46a11c3 -r05aa333abfabb4cfdc3292f2ea0d4508aef20d28
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Ringtoets.Common.Forms.csproj	(.../Ringtoets.Common.Forms.csproj)	(revision 4b5247bbd278f66bb4536a0c92beb667e46a11c3)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Ringtoets.Common.Forms.csproj	(.../Ringtoets.Common.Forms.csproj)	(revision 05aa333abfabb4cfdc3292f2ea0d4508aef20d28)
@@ -131,6 +131,9 @@
     <Compile Include="UITypeEditors\IHasStructureProperty.cs" />
     <Compile Include="PresentationObjects\SelectableHydraulicBoundaryLocation.cs" />
     <Compile Include="UITypeEditors\StructureEditor.cs" />
+    <Compile Include="Controls\BoxedLabel.cs">
+      <SubType>Component</SubType>
+    </Compile>
     <Compile Include="Views\CalculatableRow.cs" />
     <Compile Include="Views\FailureMechanismSectionProbabilityAssessmentRow.cs" />
     <Compile Include="Views\FailureMechanismSectionRow.cs" />
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Controls/BoxedLabelTest.cs
===================================================================
diff -u
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Controls/BoxedLabelTest.cs	(revision 0)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Controls/BoxedLabelTest.cs	(revision 05aa333abfabb4cfdc3292f2ea0d4508aef20d28)
@@ -0,0 +1,48 @@
+// Copyright (C) Stichting Deltares 2017. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System.Drawing;
+using System.Windows.Forms;
+using NUnit.Framework;
+using Ringtoets.Common.Forms.Controls;
+
+namespace Ringtoets.Common.Forms.Test.Controls
+{
+    [TestFixture]
+    public class BoxedLabelTest
+    {
+        [Test]
+        public void DefaultConstructor_ExpectedValues()
+        {
+            // Call
+            var boxedLabel = new BoxedLabel();
+
+            // Assert
+            Assert.IsInstanceOf<Label>(boxedLabel);
+            Assert.IsTrue(boxedLabel.AutoSize);
+            Assert.AreEqual(BorderStyle.FixedSingle, boxedLabel.BorderStyle);
+            Assert.AreEqual(DockStyle.Fill, boxedLabel.Dock);
+            Assert.AreEqual(new Size(50, 0), boxedLabel.MinimumSize);
+            Assert.AreEqual(new Padding(5, 0, 5, 0), boxedLabel.Padding);
+            Assert.AreEqual(ContentAlignment.MiddleLeft, boxedLabel.TextAlign);
+        }
+    }
+}
\ No newline at end of file
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Ringtoets.Common.Forms.Test.csproj
===================================================================
diff -u -r97f7a566130ab8bf4f78fa3bd9f6f6491749dd5b -r05aa333abfabb4cfdc3292f2ea0d4508aef20d28
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Ringtoets.Common.Forms.Test.csproj	(.../Ringtoets.Common.Forms.Test.csproj)	(revision 97f7a566130ab8bf4f78fa3bd9f6f6491749dd5b)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Ringtoets.Common.Forms.Test.csproj	(.../Ringtoets.Common.Forms.Test.csproj)	(revision 05aa333abfabb4cfdc3292f2ea0d4508aef20d28)
@@ -50,6 +50,7 @@
     <Compile Include="ChangeHandlers\FailureMechanismPropertyChangeHandlerTest.cs" />
     <Compile Include="ChangeHandlers\PropertyChangeHelperTest.cs" />
     <Compile Include="ChangeHandlers\CalculationChangeHandlerTest.cs" />
+    <Compile Include="Controls\BoxedLabelTest.cs" />
     <Compile Include="ExportInfos\RingtoetsExportInfoFactoryTest.cs" />
     <Compile Include="Factories\RingtoetsGraphNodeFactoryTest.cs" />
     <Compile Include="Factories\RingtoetsStackChartDataFactoryTest.cs" />