diff --git a/src/Artemis.UI/Screens/ProfileEditor/LayerProperties/Timeline/Dialogs/TimelineSegmentDialogView.xaml b/src/Artemis.UI/Screens/ProfileEditor/LayerProperties/Timeline/Dialogs/TimelineSegmentDialogView.xaml
index 4a4c6da38..5085f1982 100644
--- a/src/Artemis.UI/Screens/ProfileEditor/LayerProperties/Timeline/Dialogs/TimelineSegmentDialogView.xaml
+++ b/src/Artemis.UI/Screens/ProfileEditor/LayerProperties/Timeline/Dialogs/TimelineSegmentDialogView.xaml
@@ -14,7 +14,8 @@
             <Run Text="Update " /><Run Text="{Binding Segment.Segment, Mode=OneWay}" /><Run Text=" segment" />
         </TextBlock>
 
-        <TextBox materialDesign:HintAssist.Hint="Segment length (seconds)"
+        <TextBox materialDesign:HintAssist.Hint="Segment length"
+                 materialDesign:TextFieldAssist.SuffixText="seconds"
                  Margin="0 8 0 16"
                  Text="{Binding InputValue, UpdateSourceTrigger=PropertyChanged}"
                  Style="{StaticResource MaterialDesignFloatingHintTextBox}" />
diff --git a/src/Artemis.UI/Screens/SurfaceEditor/Dialogs/SurfaceDeviceConfigView.xaml b/src/Artemis.UI/Screens/SurfaceEditor/Dialogs/SurfaceDeviceConfigView.xaml
index 03c6e62c6..8ebca71ee 100644
--- a/src/Artemis.UI/Screens/SurfaceEditor/Dialogs/SurfaceDeviceConfigView.xaml
+++ b/src/Artemis.UI/Screens/SurfaceEditor/Dialogs/SurfaceDeviceConfigView.xaml
@@ -14,17 +14,21 @@
         <TextBlock Text="Note: These are not being validated yet" Style="{StaticResource MaterialDesignSubtitle1TextBlock}" />
 
         <TextBox materialDesign:HintAssist.Hint="X-coordinate"
+                 materialDesign:TextFieldAssist.SuffixText="mm"
                  Text="{Binding X, UpdateSourceTrigger=PropertyChanged}"
                  Style="{StaticResource MaterialDesignFloatingHintTextBox}"
                  Margin="0 10" />
         <TextBox materialDesign:HintAssist.Hint="Y-coordinate"
+                 materialDesign:TextFieldAssist.SuffixText="mm"
                  Text="{Binding Y, UpdateSourceTrigger=PropertyChanged}"
                  Style="{StaticResource MaterialDesignFloatingHintTextBox}"
                  Margin="0 10" />
         <TextBox materialDesign:HintAssist.Hint="Scale"
+                 materialDesign:TextFieldAssist.SuffixText="times"
                  Text="{Binding Scale, UpdateSourceTrigger=PropertyChanged}" Style="{StaticResource MaterialDesignFloatingHintTextBox}"
                  Margin="0 10" />
         <TextBox materialDesign:HintAssist.Hint="Rotation"
+                 materialDesign:TextFieldAssist.SuffixText="deg"
                  Text="{Binding Rotation, UpdateSourceTrigger=PropertyChanged}"
                  Style="{StaticResource MaterialDesignFloatingHintTextBox}"
                  Margin="0 10" />