Index: Core/Gui/src/Core.Gui/Style/DeltaresButtonStyle.xaml
===================================================================
diff -u -r62e55324ba5c5cda247f17fe63dc999202ee5b58 -rd0cf8a03c3cd42a73865e04c9e4adf7c254797c3
--- Core/Gui/src/Core.Gui/Style/DeltaresButtonStyle.xaml	(.../DeltaresButtonStyle.xaml)	(revision 62e55324ba5c5cda247f17fe63dc999202ee5b58)
+++ Core/Gui/src/Core.Gui/Style/DeltaresButtonStyle.xaml	(.../DeltaresButtonStyle.xaml)	(revision d0cf8a03c3cd42a73865e04c9e4adf7c254797c3)
@@ -144,9 +144,15 @@
                                 <RowDefinition Height="auto"/>
                                 <RowDefinition Height="auto"/>
                             </Grid.RowDefinitions>
-                            <ContentPresenter Grid.Row="0" HorizontalAlignment="Center" Margin="{TemplateBinding Padding}"/>
-                            <Label Grid.Row="1" Content="{TemplateBinding Tag}"
-                                   HorizontalAlignment="Center" Foreground="{TemplateBinding Foreground}"/>
+                            <ContentPresenter Grid.Row="0"
+                                              HorizontalAlignment="Center"
+                                              Margin="{TemplateBinding Padding}"/>
+                            <TextBlock Grid.Row="1"
+                                       Text="{TemplateBinding Tag}"
+                                       Margin="{TemplateBinding Margin}"
+                                       TextAlignment="Center"
+                                       HorizontalAlignment="Center"
+                                       Foreground="{TemplateBinding Foreground}"/>
                         </Grid>
                     </Border>
                 </ControlTemplate>
Index: Riskeer/Integration/src/Riskeer.Integration.Plugin/Properties/Resources.Designer.cs
===================================================================
diff -u -rffdaea5b476af6072fa570ad76cd7649b5490fac -rd0cf8a03c3cd42a73865e04c9e4adf7c254797c3
--- Riskeer/Integration/src/Riskeer.Integration.Plugin/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision ffdaea5b476af6072fa570ad76cd7649b5490fac)
+++ Riskeer/Integration/src/Riskeer.Integration.Plugin/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision d0cf8a03c3cd42a73865e04c9e4adf7c254797c3)
@@ -456,7 +456,8 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Berekeningen.
+        ///   Looks up a localized string similar to Sterkte-
+        ///berekeningen.
         /// </summary>
         public static string RiskeerPlugin_GetStateInfos_Calculations {
             get {
@@ -465,7 +466,8 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Faalpaden.
+        ///   Looks up a localized string similar to Faalpaden /
+        ///assemblage.
         /// </summary>
         public static string RiskeerPlugin_GetStateInfos_FailurePaths {
             get {
@@ -475,7 +477,7 @@
         
         /// <summary>
         ///   Looks up a localized string similar to Hydraulische
-        /// belastingen.
+        ///belastingen.
         /// </summary>
         public static string RiskeerPlugin_GetStateInfos_HydraulicLoads {
             get {
Index: Riskeer/Integration/src/Riskeer.Integration.Plugin/Properties/Resources.resx
===================================================================
diff -u -rffdaea5b476af6072fa570ad76cd7649b5490fac -rd0cf8a03c3cd42a73865e04c9e4adf7c254797c3
--- Riskeer/Integration/src/Riskeer.Integration.Plugin/Properties/Resources.resx	(.../Resources.resx)	(revision ffdaea5b476af6072fa570ad76cd7649b5490fac)
+++ Riskeer/Integration/src/Riskeer.Integration.Plugin/Properties/Resources.resx	(.../Resources.resx)	(revision d0cf8a03c3cd42a73865e04c9e4adf7c254797c3)
@@ -252,14 +252,16 @@
     <value>Traject</value>
   </data>
     <data name="RiskeerPlugin_GetStateInfos_FailurePaths" xml:space="preserve">
-    <value>Faalpaden</value>
+    <value>Faalpaden /
+assemblage</value>
   </data>
     <data name="RiskeerPlugin_GetStateInfos_Calculations" xml:space="preserve">
-    <value>Berekeningen</value>
+    <value>Sterkte-
+berekeningen</value>
   </data>
     <data name="RiskeerPlugin_GetStateInfos_HydraulicLoads" xml:space="preserve">
     <value>Hydraulische
- belastingen</value>
+belastingen</value>
   </data>
     <data name="AssessmentSectionFromFileCommandHandler_CreateAssessmentSection_No_settings_found_for_AssessmentSection"
           xml:space="preserve">
Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/RiskeerPluginTest.cs
===================================================================
diff -u -rffdaea5b476af6072fa570ad76cd7649b5490fac -rd0cf8a03c3cd42a73865e04c9e4adf7c254797c3
--- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/RiskeerPluginTest.cs	(.../RiskeerPluginTest.cs)	(revision ffdaea5b476af6072fa570ad76cd7649b5490fac)
+++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/RiskeerPluginTest.cs	(.../RiskeerPluginTest.cs)	(revision d0cf8a03c3cd42a73865e04c9e4adf7c254797c3)
@@ -218,9 +218,9 @@
                 // Assert
                 Assert.AreEqual(4, stateInfos.Length);
                 Assert.IsTrue(stateInfos.Any(si => si.Name == "Traject"));
-                Assert.IsTrue(stateInfos.Any(si => si.Name == "Hydraulische\r\n belastingen"));
-                Assert.IsTrue(stateInfos.Any(si => si.Name == "Berekeningen"));
-                Assert.IsTrue(stateInfos.Any(si => si.Name == "Faalpaden"));
+                Assert.IsTrue(stateInfos.Any(si => si.Name == "Hydraulische\r\nbelastingen"));
+                Assert.IsTrue(stateInfos.Any(si => si.Name == "Sterkte-\r\nberekeningen"));
+                Assert.IsTrue(stateInfos.Any(si => si.Name == "Faalpaden /\r\nassemblage"));
             }
         }
 
Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/StateInfos/CalculationsStateInfoTest.cs
===================================================================
diff -u -r697903f9c21a62895b49426b5d0554d17793753e -rd0cf8a03c3cd42a73865e04c9e4adf7c254797c3
--- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/StateInfos/CalculationsStateInfoTest.cs	(.../CalculationsStateInfoTest.cs)	(revision 697903f9c21a62895b49426b5d0554d17793753e)
+++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/StateInfos/CalculationsStateInfoTest.cs	(.../CalculationsStateInfoTest.cs)	(revision d0cf8a03c3cd42a73865e04c9e4adf7c254797c3)
@@ -40,7 +40,7 @@
         public void SetUp()
         {
             plugin = new RiskeerPlugin();
-            info = plugin.GetStateInfos().First(si => si.Name == "Berekeningen");
+            info = plugin.GetStateInfos().First(si => si.Name == "Sterkte-\r\nberekeningen");
         }
 
         [TearDown]
Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/StateInfos/FailurePathsStateInfoTest.cs
===================================================================
diff -u -r697903f9c21a62895b49426b5d0554d17793753e -rd0cf8a03c3cd42a73865e04c9e4adf7c254797c3
--- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/StateInfos/FailurePathsStateInfoTest.cs	(.../FailurePathsStateInfoTest.cs)	(revision 697903f9c21a62895b49426b5d0554d17793753e)
+++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/StateInfos/FailurePathsStateInfoTest.cs	(.../FailurePathsStateInfoTest.cs)	(revision d0cf8a03c3cd42a73865e04c9e4adf7c254797c3)
@@ -40,7 +40,7 @@
         public void SetUp()
         {
             plugin = new RiskeerPlugin();
-            info = plugin.GetStateInfos().First(si => si.Name == "Faalpaden");
+            info = plugin.GetStateInfos().First(si => si.Name == "Faalpaden /\r\nassemblage");
         }
 
         [TearDown]
Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/StateInfos/HydraulicLoadsStateInfoTest.cs
===================================================================
diff -u -r697903f9c21a62895b49426b5d0554d17793753e -rd0cf8a03c3cd42a73865e04c9e4adf7c254797c3
--- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/StateInfos/HydraulicLoadsStateInfoTest.cs	(.../HydraulicLoadsStateInfoTest.cs)	(revision 697903f9c21a62895b49426b5d0554d17793753e)
+++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/StateInfos/HydraulicLoadsStateInfoTest.cs	(.../HydraulicLoadsStateInfoTest.cs)	(revision d0cf8a03c3cd42a73865e04c9e4adf7c254797c3)
@@ -40,7 +40,7 @@
         public void SetUp()
         {
             plugin = new RiskeerPlugin();
-            info = plugin.GetStateInfos().First(si => si.Name == "Hydraulische\r\n belastingen");
+            info = plugin.GetStateInfos().First(si => si.Name == "Hydraulische\r\nbelastingen");
         }
 
         [TearDown]