diff --git a/UserControls/Announcements.xaml b/UserControls/Announcements.xaml
index eead905..1ff87af 100644
--- a/UserControls/Announcements.xaml
+++ b/UserControls/Announcements.xaml
@@ -35,8 +35,11 @@
             <Label Content="{x:Static resx:Resources.announcement}"
                    FontSize="19"
                    FontWeight="SemiBold"
-                   Canvas.Top="8"
+                   Canvas.Top="6"
+                   Height="36"
                    Canvas.Left="40"
+                   VerticalContentAlignment="Center"
+                   Padding="0"
                    Foreground="{DynamicResource sectionTitleColor}" />
             <ScrollViewer x:Name="CanvasAnnouncements"
                           x:FieldModifier="private"
diff --git a/UserControls/ComputerInformation.xaml b/UserControls/ComputerInformation.xaml
index 5fa8f7e..27685d0 100644
--- a/UserControls/ComputerInformation.xaml
+++ b/UserControls/ComputerInformation.xaml
@@ -162,6 +162,9 @@
                    FontSize="19"
                    FontWeight="SemiBold"
                    Canvas.Top="8"
+                   Height="32"
+                   VerticalContentAlignment="Center"
+                   Padding="0"
                    Canvas.Left="40" />
 
             <StackPanel Canvas.Top="56"
diff --git a/UserControls/CustomLinks.xaml b/UserControls/CustomLinks.xaml
index a42b775..65892af 100644
--- a/UserControls/CustomLinks.xaml
+++ b/UserControls/CustomLinks.xaml
@@ -33,7 +33,10 @@
             <Label Foreground="{DynamicResource sectionTitleColor}"
                    FontSize="19"
                    FontWeight="SemiBold"
-                   Canvas.Top="8"
+                   Canvas.Top="6"
+                   Height="36"
+                   VerticalContentAlignment="Center"
+                   Padding="0"
                    Canvas.Left="40"
                    Content="{x:Static resx:Resources.CustomLink}" />
             <ScrollViewer Canvas.Top="56"
diff --git a/UserControls/Incidents.xaml b/UserControls/Incidents.xaml
index 96e6db5..fc07530 100644
--- a/UserControls/Incidents.xaml
+++ b/UserControls/Incidents.xaml
@@ -79,7 +79,10 @@
                    Content="{x:Static resx:Resources.incidents}"
                    FontSize="19"
                    FontWeight="SemiBold"
-                   Canvas.Top="8"
+                   Canvas.Top="6"
+                   Height="36"
+                   VerticalContentAlignment="Center"
+                   Padding="0"
                    Canvas.Left="40" />
             <ScrollViewer x:Name="CanvasIncident"
                           Canvas.Top="56"
diff --git a/UserControls/PortalSearch.xaml b/UserControls/PortalSearch.xaml
index 96f187f..0344de9 100644
--- a/UserControls/PortalSearch.xaml
+++ b/UserControls/PortalSearch.xaml
@@ -102,7 +102,10 @@
                    Content="{x:Static resx:Resources.search}"
                    FontSize="19"
                    FontWeight="SemiBold"
-                   Canvas.Top="8"
+                   Canvas.Top="6"
+                   Height="36"
+                   VerticalContentAlignment="Center"
+                   Padding="0"
                    Canvas.Left="40" />
             <StackPanel Orientation="Horizontal"
                         Width="350"
diff --git a/forms/configInfo.xaml b/forms/configInfo.xaml
index 701fd95..dce9648 100644
--- a/forms/configInfo.xaml
+++ b/forms/configInfo.xaml
@@ -113,13 +113,13 @@
             <Setter Property="Background"
                     Value="Transparent" />
             <Setter Property="BorderBrush"
-                    Value="{DynamicResource inputBorderColor}" />
+                    Value="Transparent" />
             <Setter Property="BorderThickness"
-                    Value="1" />
+                    Value="0" />
             <Setter Property="Width"
-                    Value="30" />
+                    Value="32" />
             <Setter Property="Height"
-                    Value="30" />
+                    Value="32" />
             <Setter Property="Cursor"
                     Value="Hand" />
             <Setter Property="Template">
@@ -129,7 +129,7 @@
                                 Background="{TemplateBinding Background}"
                                 BorderBrush="{TemplateBinding BorderBrush}"
                                 BorderThickness="{TemplateBinding BorderThickness}"
-                                CornerRadius="9">
+                                CornerRadius="10">
                             <ContentPresenter HorizontalAlignment="Center"
                                               VerticalAlignment="Center" />
                         </Border>
@@ -138,16 +138,13 @@
                                      Value="True">
                                 <Setter TargetName="ControlBorder"
                                         Property="Background"
-                                        Value="{DynamicResource inactiveButtonColor}" />
-                                <Setter TargetName="ControlBorder"
-                                        Property="BorderBrush"
-                                        Value="{DynamicResource itemHoverBorderColor}" />
+                                        Value="{DynamicResource headerControlHoverBackgroundColor}" />
                             </Trigger>
                             <Trigger Property="IsPressed"
                                      Value="True">
                                 <Setter TargetName="ControlBorder"
                                         Property="Opacity"
-                                        Value="0.92" />
+                                        Value="0.9" />
                             </Trigger>
                         </ControlTemplate.Triggers>
                     </ControlTemplate>
@@ -196,7 +193,7 @@
                            Source="/Customer Panel;component/Resources/consulting4it-header1.png" />
                     <Button Grid.Column="2"
                             Content="X"
-                            FontSize="14"
+                            FontSize="15"
                             FontWeight="Bold"
                             Style="{StaticResource ConfigHeaderButtonStyle}"
                             Click="OnCloseButtonClick"