diff --git a/BeWo/View/Controls/Wohnhilfe/CustomerWohnhilfeControl.xaml b/BeWo/View/Controls/Wohnhilfe/CustomerWohnhilfeControl.xaml
index d14b7f75f..01ed0a46d 100644
--- a/BeWo/View/Controls/Wohnhilfe/CustomerWohnhilfeControl.xaml
+++ b/BeWo/View/Controls/Wohnhilfe/CustomerWohnhilfeControl.xaml
@@ -39,7 +39,7 @@
         </Style>
         <Style TargetType="ComboBox" BasedOn="{StaticResource {x:Type ComboBox}}">
             <Setter Property="Margin" Value="3"/>
-            <Setter Property="MinHeight" Value="23"/>
+            <Setter Property="Height" Value="23"/>
             <Setter Property="ItemTemplate" Value="{StaticResource ListItemView}"/>
             <Setter Property="Margin" Value="3"/>
         </Style>
@@ -69,18 +69,17 @@
             <Setter Property="Margin" Value="3"/>
             <Setter Property="Padding" Value="1"/>
             <Setter Property="Height" Value="23"/>
+            <Setter Property="Background" Value="{DynamicResource {x:Static SystemColors.WindowBrushKey}}" />
+            <Setter Property="BorderBrush" Value="{StaticResource TextBoxBorderBrush}" />
+            <Setter Property="BorderThickness" Value="1" />
             <Style.Resources>
                 <DataTemplate x:Key="{dxet:ButtonsThemeKey ResourceKey=ToggleButtonInfoTemplate, IsThemeIndependent=True}">
-                    <Border Margin="1"
-                            Padding="1"
-                            UseLayoutRounding="True">
-                        <dx:ToggleStateButton IsChecked="{Binding Path=IsChecked, Mode=TwoWay}"
+                    <dx:ToggleStateButton IsChecked="{Binding Path=IsChecked, Mode=TwoWay}"
                                               x:Name="PART_Item"
-                                              Margin="0"
+                                              Margin="2"
                                               dxei:SetIsCheckedToButtonInfoBehavior.IsEnabled="True"
                                               Style="{StaticResource ComboBoxTransparentButtonStyle}">
-                        </dx:ToggleStateButton>
-                    </Border>
+                    </dx:ToggleStateButton>
                     <DataTemplate.Triggers>
                         <DataTrigger Binding="{Binding Path=IsDefaultButton}"
                                      Value="True">