diff --git a/MainWindow.xaml b/MainWindow.xaml
index a323987..f1c7c67 100644
--- a/MainWindow.xaml
+++ b/MainWindow.xaml
@@ -233,6 +233,67 @@
         </Style>
         <Style TargetType="Image"
                x:Key="ImageStyle" />
+        <Style TargetType="Image"
+               x:Key="SignalMarkerStyle"
+               BasedOn="{StaticResource ImageStyle}">
+            <Setter Property="RenderTransformOrigin"
+                    Value="0.5,0.5" />
+            <Setter Property="RenderTransform">
+                <Setter.Value>
+                    <ScaleTransform ScaleX="0.8"
+                                    ScaleY="0.8" />
+                </Setter.Value>
+            </Setter>
+            <Setter Property="SnapsToDevicePixels"
+                    Value="False" />
+        </Style>
+        <Style TargetType="Button"
+               x:Key="HeaderIconButtonStyle">
+            <Setter Property="Foreground"
+                    Value="{DynamicResource navForeground}" />
+            <Setter Property="Background"
+                    Value="{DynamicResource headerControlBackgroundColor}" />
+            <Setter Property="BorderBrush"
+                    Value="{DynamicResource panelBorderColor}" />
+            <Setter Property="BorderThickness"
+                    Value="1" />
+            <Setter Property="Cursor"
+                    Value="Hand" />
+            <Setter Property="Width"
+                    Value="32" />
+            <Setter Property="Height"
+                    Value="32" />
+            <Setter Property="Padding"
+                    Value="0" />
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="{x:Type Button}">
+                        <Border x:Name="HeaderButtonBorder"
+                                Background="{TemplateBinding Background}"
+                                BorderBrush="{TemplateBinding BorderBrush}"
+                                BorderThickness="{TemplateBinding BorderThickness}"
+                                CornerRadius="10">
+                            <ContentPresenter HorizontalAlignment="Center"
+                                              VerticalAlignment="Center" />
+                        </Border>
+                        <ControlTemplate.Triggers>
+                            <Trigger Property="IsMouseOver"
+                                     Value="True">
+                                <Setter TargetName="HeaderButtonBorder"
+                                        Property="Background"
+                                        Value="{DynamicResource inactiveButtonColor}" />
+                            </Trigger>
+                            <Trigger Property="IsPressed"
+                                     Value="True">
+                                <Setter TargetName="HeaderButtonBorder"
+                                        Property="Opacity"
+                                        Value="0.9" />
+                            </Trigger>
+                        </ControlTemplate.Triggers>
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
+        </Style>
 
         <DrawingImage x:Key="OverlayOffline">
             <DrawingImage.Drawing>
@@ -280,33 +341,34 @@
                        HorizontalAlignment="Left"
                        Margin="14,14,0,0"
                        x:Name="Logo" />
-                <TextBlock x:Name="Close_Text"
-                           MouseDown="OnMinimizeClicked"
-                           HorizontalAlignment="Right"
-                           VerticalAlignment="Top"
-                           Width="28"
-                           Height="28"
-                           FontSize="16"
-                           TextAlignment="Center"
-                           Padding="0,2,0,0"
-                           Background="{DynamicResource headerControlBackgroundColor}"
-                           Foreground="{DynamicResource navForeground}"
-                           FontWeight="Bold"
-                           Margin="0,12,12,0"
-                           Cursor="Hand"
-                           ToolTip="{x:Static resx:Resources.close}"
-                           Panel.ZIndex="500"><Run Text="X" /></TextBlock>
-                <Image x:Name="RefreshIcon"
-                       Source="{DynamicResource nav_appbar_refresh}"
-                       Tag="ICO"
-                       Panel.ZIndex="500"
-                       HorizontalAlignment="Right"
-                       Width="20"
-                       Height="20"
-                       VerticalAlignment="Top"
-                       Margin="0,16,88,0"
-                       MouseDown="OnRefreshClicked"
-                       Cursor="Hand" />
+                <Button x:Name="Close_Text"
+                        Style="{StaticResource HeaderIconButtonStyle}"
+                        HorizontalAlignment="Right"
+                        VerticalAlignment="Top"
+                        Margin="0,12,12,0"
+                        Panel.ZIndex="500"
+                        ToolTip="{x:Static resx:Resources.close}"
+                        PreviewMouseDown="OnMinimizeClicked">
+                    <TextBlock Text="X"
+                               FontSize="15"
+                               FontWeight="Bold"
+                               TextAlignment="Center"
+                               VerticalAlignment="Center"
+                               HorizontalAlignment="Center" />
+                </Button>
+                <Button x:Name="RefreshIcon"
+                        Style="{StaticResource HeaderIconButtonStyle}"
+                        HorizontalAlignment="Right"
+                        VerticalAlignment="Top"
+                        Margin="0,12,88,0"
+                        Panel.ZIndex="500"
+                        ToolTip="Refresh"
+                        PreviewMouseDown="OnRefreshClicked">
+                    <Image Source="{DynamicResource nav_appbar_refresh}"
+                           Tag="ICO"
+                           Width="16"
+                           Height="16" />
+                </Button>
                 <!--<TextBlock MouseDown="OnCloseClicked" HorizontalAlignment="Right" FontSize="20" FontWeight="Bold" Margin="0,-5,5,0" Cursor="Hand" Panel.ZIndex="500"  >X</TextBlock>-->
                 <Image Source="{DynamicResource nav_appbar_network_server_disconnect}"
                        Tag="ICO"
@@ -472,10 +534,8 @@
                             <Image Source="Resources/StateOverlays/OverlayNewContentButton.png"
                                    Visibility="Collapsed"
                                    Panel.ZIndex="18"
-                                   Style="{StaticResource ImageStyle}"
+                                   Style="{StaticResource SignalMarkerStyle}"
                                    Tag="Signal"
-                                   Width="12"
-                                   Height="12"
                                    Stretch="None"
                                    HorizontalAlignment="Center"
                                    VerticalAlignment="Center"
@@ -530,10 +590,8 @@
                             <Image Source="Resources/StateOverlays/OverlayNewContentButton.png"
                                    Visibility="Collapsed"
                                    Panel.ZIndex="18"
-                                   Style="{StaticResource ImageStyle}"
+                                   Style="{StaticResource SignalMarkerStyle}"
                                    Tag="Signal"
-                                   Width="12"
-                                   Height="12"
                                    Stretch="None"
                                    HorizontalAlignment="Center"
                                    VerticalAlignment="Center"
@@ -587,10 +645,8 @@
                             <Image Source="Resources/StateOverlays/OverlayNewContentButton.png"
                                    Visibility="Collapsed"
                                    Panel.ZIndex="18"
-                                   Style="{StaticResource ImageStyle}"
+                                   Style="{StaticResource SignalMarkerStyle}"
                                    Tag="Signal"
-                                   Width="12"
-                                   Height="12"
                                    Stretch="None"
                                    HorizontalAlignment="Center"
                                    VerticalAlignment="Center"
@@ -645,10 +701,8 @@
                             <Image Source="Resources/StateOverlays/OverlayNewContentButton.png"
                                    Visibility="Collapsed"
                                    Panel.ZIndex="18"
-                                   Style="{StaticResource ImageStyle}"
+                                   Style="{StaticResource SignalMarkerStyle}"
                                    Tag="Signal"
-                                   Width="12"
-                                   Height="12"
                                    Stretch="None"
                                    HorizontalAlignment="Center"
                                    VerticalAlignment="Center"
@@ -703,10 +757,8 @@
                             <Image Source="Resources/StateOverlays/OverlayNewContentButton.png"
                                    Visibility="Collapsed"
                                    Panel.ZIndex="18"
-                                   Style="{StaticResource ImageStyle}"
+                                   Style="{StaticResource SignalMarkerStyle}"
                                    Tag="Signal"
-                                   Width="12"
-                                   Height="12"
                                    Stretch="None"
                                    HorizontalAlignment="Center"
                                    VerticalAlignment="Center"
diff --git a/UserControls/AnnouncementListItem.xaml b/UserControls/AnnouncementListItem.xaml
index d0adff9..7bf9932 100644
--- a/UserControls/AnnouncementListItem.xaml
+++ b/UserControls/AnnouncementListItem.xaml
@@ -39,7 +39,24 @@
             </Grid.RowDefinitions>
             <Grid Background="{Binding Path=PrioColor}" Grid.RowSpan="3" x:Name="annColor"></Grid>
             <DockPanel Grid.Column="1" >
-                <Image Source="pack://application:,,,/Resources/StateOverlays/OverlayNewContentButton.png" Panel.ZIndex="18" Stretch="None" HorizontalAlignment="Center" VerticalAlignment="Center" Visibility="{Binding Path=IsUnread, Converter={StaticResource BoolToVis}}" x:Name="signal" Width="12" Height="12" Cursor="Hand" ToolTip="{x:Static resx:Resources.removeMarkup}" Margin="5,0,0,0"  />
+                <Image Source="pack://application:,,,/Resources/StateOverlays/OverlayNewContentButton.png"
+                       Panel.ZIndex="18"
+                       Stretch="None"
+                       HorizontalAlignment="Center"
+                       VerticalAlignment="Center"
+                       Visibility="{Binding Path=IsUnread, Converter={StaticResource BoolToVis}}"
+                       x:Name="signal"
+                       Width="15"
+                       Height="15"
+                       Cursor="Hand"
+                       ToolTip="{x:Static resx:Resources.removeMarkup}"
+                       Margin="5,0,0,0"
+                       RenderTransformOrigin="0.5,0.5">
+                    <Image.RenderTransform>
+                        <ScaleTransform ScaleX="0.8"
+                                        ScaleY="0.8" />
+                    </Image.RenderTransform>
+                </Image>
                 <TextBlock x:Name="txtDate" Grid.Row="0" Margin="10,0,5,0" HorizontalAlignment="Left" VerticalAlignment="Center" FontStyle="Italic" Foreground="{DynamicResource subtleTextColor}" Text="{Binding Path=CreatedDate,StringFormat={}{0:dd.MM.yyyy},FallbackValue='01.01.2021'}"></TextBlock>
             </DockPanel>
 
diff --git a/UserControls/ComputerInformation.xaml b/UserControls/ComputerInformation.xaml
index a478bf0..f5278cb 100644
--- a/UserControls/ComputerInformation.xaml
+++ b/UserControls/ComputerInformation.xaml
@@ -47,6 +47,7 @@
                 </Trigger>
             </Style.Triggers>
         </Style>
+
         <Style x:Key="InfoTextBoxStyle"
                TargetType="{x:Type TextBox}">
             <Setter Property="Foreground"
@@ -58,7 +59,7 @@
             <Setter Property="BorderThickness"
                     Value="1" />
             <Setter Property="Padding"
-                    Value="8,3" />
+                    Value="8,4" />
             <Setter Property="Template">
                 <Setter.Value>
                     <ControlTemplate TargetType="{x:Type TextBox}">
@@ -72,10 +73,63 @@
                 </Setter.Value>
             </Setter>
         </Style>
+
+        <Style x:Key="InfoRowIconStyle"
+               TargetType="{x:Type Image}">
+            <Setter Property="Width"
+                    Value="24" />
+            <Setter Property="Height"
+                    Value="24" />
+            <Setter Property="Canvas.Left"
+                    Value="0" />
+            <Setter Property="Canvas.Top"
+                    Value="0" />
+        </Style>
+
+        <Style x:Key="InfoRowLabelStyle"
+               TargetType="{x:Type Label}">
+            <Setter Property="Foreground"
+                    Value="{DynamicResource sectionTitleColor}" />
+            <Setter Property="FontSize"
+                    Value="16" />
+            <Setter Property="Canvas.Left"
+                    Value="40" />
+            <Setter Property="Canvas.Top"
+                    Value="-2" />
+        </Style>
+
+        <Style x:Key="InfoRowValueStyle"
+               TargetType="{x:Type TextBox}"
+               BasedOn="{StaticResource InfoTextBoxStyle}">
+            <Setter Property="Width"
+                    Value="310" />
+            <Setter Property="Height"
+                    Value="28" />
+            <Setter Property="FontSize"
+                    Value="15" />
+            <Setter Property="Canvas.Left"
+                    Value="12" />
+            <Setter Property="Canvas.Top"
+                    Value="20" />
+        </Style>
+
+        <Style x:Key="InfoRowCopyStyle"
+               TargetType="{x:Type Image}">
+            <Setter Property="Cursor"
+                    Value="Hand" />
+            <Setter Property="Width"
+                    Value="22" />
+            <Setter Property="Height"
+                    Value="22" />
+            <Setter Property="Canvas.Left"
+                    Value="325" />
+            <Setter Property="Canvas.Top"
+                    Value="23" />
+        </Style>
     </UserControl.Resources>
 
-    <!--ComputerInformation-->
-    <Grid x:Name="GridInfo" x:FieldModifier="private"
+    <Grid x:Name="GridInfo"
+          x:FieldModifier="private"
           Width="500">
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="100*" />
@@ -83,20 +137,15 @@
             <ColumnDefinition Width="185*" />
             <ColumnDefinition Width="30*" />
         </Grid.ColumnDefinitions>
-        <Grid.RowDefinitions>
-            <RowDefinition Height="6*" />
-            <RowDefinition Height="7*" />
-        </Grid.RowDefinitions>
 
         <Canvas x:Name="CanvasInfo"
                 Grid.Column="1"
                 Grid.ColumnSpan="2"
-                Grid.Row="0"
                 Height="560">
             <Image Source="{DynamicResource appbar_information}"
-                   Width="36"
-                   Height="36"
-                   Margin="0,6,0,0"
+                   Width="32"
+                   Height="32"
+                   Canvas.Top="8"
                    Tag="MAINICO" />
             <Label Foreground="{DynamicResource sectionTitleColor}"
                    Content="{x:Static resx:Resources.information}"
@@ -109,244 +158,175 @@
                         Canvas.Left="0"
                         Width="350">
                 <Canvas Width="350"
-                        Height="54">
+                        Height="50">
                     <Image Source="{DynamicResource appbar_monitor}"
-                           Height="30"
+                           Style="{StaticResource InfoRowIconStyle}"
                            x:Name="icoComputer_Inline"
                            x:FieldModifier="private" />
-                    <Label Foreground="{DynamicResource sectionTitleColor}"
-                           x:Name="LblComputername"
+                    <Label x:Name="LblComputername"
                            x:FieldModifier="private"
-                           Content="{x:Static resx:Resources.computername}"
-                           FontSize="16"
-                           Canvas.Top="4"
-                           Canvas.Left="40" />
-                    <TextBox Canvas.Left="15"
-                             Width="300"
-                             Height="24"
-                             FontSize="16"
-                             VerticalAlignment="Center"
-                             Style="{StaticResource InfoTextBoxStyle}"
-                             x:Name="TxtComputername"
+                           Style="{StaticResource InfoRowLabelStyle}"
+                           Content="{x:Static resx:Resources.computername}" />
+                    <TextBox x:Name="TxtComputername"
                              x:FieldModifier="private"
+                             Style="{StaticResource InfoRowValueStyle}"
                              IsReadOnly="true"
-                             Canvas.Top="26"
                              PreviewMouseDoubleClick="Info_TXT_OnMouseDoubleClick" />
-                    <Image Cursor="Hand"
-                           Source="{DynamicResource appbar_page_copy}"
-                           Height="22"
-                           x:Name="icoCopyComputer"
+                    <Image x:Name="icoCopyComputer"
                            x:FieldModifier="private"
+                           Style="{StaticResource InfoRowCopyStyle}"
+                           Source="{DynamicResource appbar_page_copy}"
                            Tag="MAINICO"
-                           Canvas.Left="315"
-                           Canvas.Top="26"
-                           Width="24"
                            PreviewMouseDown="ClickCopyIcon" />
                 </Canvas>
 
                 <Canvas Width="350"
-                        Height="54">
+                        Height="50">
                     <Image Source="{DynamicResource appbar_network}"
-                           Height="30"
+                           Style="{StaticResource InfoRowIconStyle}"
                            x:Name="icoNetwork_Inline"
                            x:FieldModifier="private" />
-                    <Label Foreground="{DynamicResource sectionTitleColor}"
-                           FontSize="16"
-                           x:Name="LblIpaddress"
+                    <Label x:Name="LblIpaddress"
                            x:FieldModifier="private"
-                           Content="{x:Static resx:Resources.ipaddress}"
-                           Canvas.Top="4"
-                           Canvas.Left="40" />
-                    <TextBox Canvas.Left="15"
-                             Width="300"
-                             Height="24"
-                             VerticalAlignment="Center"
-                             FontSize="16"
-                             Style="{StaticResource InfoTextBoxStyle}"
-                             x:Name="TxtIpaddress"
+                           Style="{StaticResource InfoRowLabelStyle}"
+                           Content="{x:Static resx:Resources.ipaddress}" />
+                    <TextBox x:Name="TxtIpaddress"
                              x:FieldModifier="private"
+                             Style="{StaticResource InfoRowValueStyle}"
                              IsReadOnly="true"
-                             Canvas.Top="26"
                              PreviewMouseDoubleClick="Info_TXT_OnMouseDoubleClick" />
-                    <Image Cursor="Hand"
-                           Source="{DynamicResource appbar_page_copy}"
-                           Height="22"
-                           x:Name="icoCopyNetwork"
+                    <Image x:Name="icoCopyNetwork"
                            x:FieldModifier="private"
+                           Style="{StaticResource InfoRowCopyStyle}"
+                           Source="{DynamicResource appbar_page_copy}"
                            Tag="MAINICO"
-                           Canvas.Left="315"
-                           Canvas.Top="26"
-                           Width="24"
                            PreviewMouseDown="ClickCopyIcon" />
                 </Canvas>
 
                 <Canvas Width="350"
-                        Height="54"
+                        Height="50"
                         x:Name="CanvasHostname"
                         x:FieldModifier="private">
                     <Image Source="{DynamicResource appbar_remotehost}"
-                           Height="30"
+                           Style="{StaticResource InfoRowIconStyle}"
                            x:Name="icoHost_Inline"
                            x:FieldModifier="private" />
-                    <Label Foreground="{DynamicResource sectionTitleColor}"
-                           x:Name="LblHostname"
+                    <Label x:Name="LblHostname"
                            x:FieldModifier="private"
-                           Content="{x:Static resx:Resources.Hostname}"
-                           FontSize="16"
-                           Canvas.Top="4"
-                           Canvas.Left="40" />
-                    <TextBox Canvas.Left="15"
-                             Width="300"
-                             Height="24"
-                             FontSize="16"
-                             VerticalAlignment="Center"
-                             Style="{StaticResource InfoTextBoxStyle}"
-                             x:Name="TxtHostname"
+                           Style="{StaticResource InfoRowLabelStyle}"
+                           Content="{x:Static resx:Resources.Hostname}" />
+                    <TextBox x:Name="TxtHostname"
                              x:FieldModifier="private"
+                             Style="{StaticResource InfoRowValueStyle}"
                              IsReadOnly="true"
-                             Canvas.Top="26"
                              PreviewMouseDoubleClick="Info_TXT_OnMouseDoubleClick" />
-                    <Image Cursor="Hand"
-                           Source="{DynamicResource appbar_page_copy}"
-                           Height="22"
-                           x:Name="icoCopyHost"
+                    <Image x:Name="icoCopyHost"
                            x:FieldModifier="private"
+                           Style="{StaticResource InfoRowCopyStyle}"
+                           Source="{DynamicResource appbar_page_copy}"
                            Tag="MAINICO"
-                           Canvas.Left="315"
-                           Canvas.Top="26"
-                           Width="24"
                            PreviewMouseDown="ClickCopyIcon" />
                 </Canvas>
 
                 <Canvas Width="350"
-                        Height="54">
+                        Height="50">
                     <Image Source="{DynamicResource appbar_people}"
-                           Height="30"
+                           Style="{StaticResource InfoRowIconStyle}"
                            x:Name="icoUser_Inline"
                            x:FieldModifier="private" />
-                    <Label Foreground="{DynamicResource sectionTitleColor}"
-                           FontSize="16"
-                           x:Name="LblUsername"
+                    <Label x:Name="LblUsername"
                            x:FieldModifier="private"
-                           Content="{x:Static resx:Resources.username}"
-                           Canvas.Top="4"
-                           Canvas.Left="40" />
-                    <TextBox Canvas.Left="15"
-                             Width="300"
-                             Height="24"
-                             VerticalAlignment="Center"
-                             FontSize="16"
-                             Style="{StaticResource InfoTextBoxStyle}"
-                             x:Name="TxtUsername"
+                           Style="{StaticResource InfoRowLabelStyle}"
+                           Content="{x:Static resx:Resources.username}" />
+                    <TextBox x:Name="TxtUsername"
                              x:FieldModifier="private"
+                             Style="{StaticResource InfoRowValueStyle}"
                              IsEnabled="true"
                              IsReadOnly="true"
-                             Canvas.Top="26"
                              PreviewMouseDoubleClick="Info_TXT_OnMouseDoubleClick" />
-                    <Image Cursor="Hand"
-                           Source="{DynamicResource appbar_page_copy}"
-                           Height="22"
-                           x:Name="icoCopyUser"
+                    <Image x:Name="icoCopyUser"
                            x:FieldModifier="private"
+                           Style="{StaticResource InfoRowCopyStyle}"
+                           Source="{DynamicResource appbar_page_copy}"
                            Tag="MAINICO"
-                           Canvas.Left="315"
-                           Canvas.Top="26"
-                           Width="24"
                            PreviewMouseDown="ClickCopyIcon" />
                 </Canvas>
 
                 <Canvas Width="350"
-                        Height="54">
+                        Height="50">
                     <Image Source="{DynamicResource appbar_reset}"
-                           Height="30"
+                           Style="{StaticResource InfoRowIconStyle}"
                            x:Name="icoRestart_Inline"
                            x:FieldModifier="private"
                            Tag="MAINICO" />
-                    <Label Foreground="{DynamicResource sectionTitleColor}"
-                           FontSize="16"
-                           x:Name="LblLastreboot"
+                    <Label x:Name="LblLastreboot"
                            x:FieldModifier="private"
-                           Content="{x:Static resx:Resources.lastreboot}"
-                           Canvas.Top="4"
-                           Canvas.Left="40" />
-                    <TextBox Canvas.Left="15"
-                             Width="300"
-                             Height="24"
-                             VerticalAlignment="Center"
-                             FontSize="16"
-                             Style="{StaticResource InfoTextBoxStyle}"
-                             x:Name="TxtLastreboot"
+                           Style="{StaticResource InfoRowLabelStyle}"
+                           Content="{x:Static resx:Resources.lastreboot}" />
+                    <TextBox x:Name="TxtLastreboot"
                              x:FieldModifier="private"
+                             Style="{StaticResource InfoRowValueStyle}"
                              IsReadOnly="true"
-                             Canvas.Top="26"
                              MouseDoubleClick="Info_TXT_OnMouseDoubleClick" />
-                    <Image Cursor="Hand"
-                           Source="{DynamicResource appbar_page_copy}"
-                           Height="22"
-                           x:Name="icoCopyRestart"
+                    <Image x:Name="icoCopyRestart"
                            x:FieldModifier="private"
+                           Style="{StaticResource InfoRowCopyStyle}"
+                           Source="{DynamicResource appbar_page_copy}"
                            Tag="MAINICO"
-                           Canvas.Left="315"
-                           Canvas.Top="26"
-                           Width="24"
                            PreviewMouseDown="ClickCopyIcon" />
                 </Canvas>
 
                 <Canvas Width="350"
-                        Height="74">
+                        Height="86">
                     <Image Source="{DynamicResource appbar_folder_ellipsis}"
-                           Height="30"
+                           Style="{StaticResource InfoRowIconStyle}"
                            x:Name="icoDrive_Inline"
                            x:FieldModifier="private"
                            Tag="MAINICO" />
-                    <Label Foreground="{DynamicResource sectionTitleColor}"
-                           x:Name="LblDrives"
+                    <Label x:Name="LblDrives"
                            x:FieldModifier="private"
-                           Content="{x:Static resx:Resources.drives}"
-                           FontSize="16"
-                           Canvas.Top="4"
-                           Canvas.Left="40" />
-                    <StackPanel Canvas.Left="15"
-                                Canvas.Top="28"
+                           Style="{StaticResource InfoRowLabelStyle}"
+                           Content="{x:Static resx:Resources.drives}" />
+                    <StackPanel Canvas.Left="8"
+                                Canvas.Top="24"
                                 Orientation="Vertical"
-                                Width="300">
+                                Width="334">
                         <StackPanel x:Name="StPaDrives"
                                      x:FieldModifier="private"
-                                     Width="300"
+                                     Width="334"
                                      CanHorizontallyScroll="True"
                                      CanVerticallyScroll="True"
                                      MinHeight="30"
                                      MaxHeight="30"
-                                     HorizontalAlignment="Center"
+                                     HorizontalAlignment="Left"
                                      VerticalAlignment="Stretch"
                                      Orientation="Horizontal" />
                         <StackPanel x:Name="StPaDrives2"
                                      x:FieldModifier="private"
-                                     Width="300"
+                                     Width="334"
                                      CanHorizontallyScroll="True"
                                      CanVerticallyScroll="True"
                                      MinHeight="30"
                                      MaxHeight="30"
-                                     HorizontalAlignment="Center"
+                                     HorizontalAlignment="Left"
                                      VerticalAlignment="Stretch"
                                      Orientation="Horizontal" />
                     </StackPanel>
                 </Canvas>
 
                 <Canvas Width="350"
-                        Height="130">
+                        Height="110">
                     <Label Content="{x:Static resx:Resources.genReportHeader}"
                            Foreground="{DynamicResource sectionTitleColor}"
-                           Canvas.Left="58"
-                           Canvas.Top="0"
                            FontSize="16"
-                           HorizontalAlignment="Center"
-                           VerticalAlignment="Top" />
+                           Width="334"
+                           Canvas.Left="8"
+                           Canvas.Top="0"
+                           HorizontalContentAlignment="Center" />
                     <Button Foreground="{DynamicResource buttonTextColor}"
-                            HorizontalAlignment="Left"
                             Style="{StaticResource ButtonStyle}"
                             Width="250"
-                            Height="38"
+                            Height="36"
                             x:Name="BtnClientReport"
                             x:FieldModifier="private"
                             Content="{x:Static resx:Resources.genReport}"
@@ -355,10 +335,9 @@
                             Canvas.Left="50"
                             Canvas.Top="24" />
                     <Button Foreground="{DynamicResource buttonTextColor}"
-                            HorizontalAlignment="Center"
                             Style="{StaticResource ButtonStyle}"
                             Width="250"
-                            Height="38"
+                            Height="36"
                             x:Name="BtnRemoteSupport"
                             x:FieldModifier="private"
                             Tag="LABEL"
@@ -367,13 +346,13 @@
                             Click="OnRemoteSupportClicked"
                             Visibility="Visible"
                             Canvas.Left="50"
-                            Canvas.Top="70" />
+                            Canvas.Top="66" />
                     <Grid Panel.ZIndex="100"
                           x:Name="PRGSGrid"
                           x:FieldModifier="private"
                           Visibility="Hidden"
                           Canvas.Left="100"
-                          Canvas.Top="31">
+                          Canvas.Top="29">
                         <uctrl:CustomProgressBar x:Name="PRGS"
                                                  x:FieldModifier="private"
                                                  Visibility="Visible"
@@ -386,14 +365,18 @@
                                    HorizontalAlignment="Center"
                                    VerticalAlignment="Center" />
                     </Grid>
-                    <Label x:Name="LblCustomerPanelVersion"
-                           x:FieldModifier="private"
-                           FontSize="12"
-                           Canvas.Left="118"
-                           Canvas.Top="112" />
                 </Canvas>
             </StackPanel>
 
+            <Label x:Name="LblCustomerPanelVersion"
+                   x:FieldModifier="private"
+                   FontSize="12"
+                   Width="334"
+                   Canvas.Left="8"
+                   Canvas.Top="536"
+                   HorizontalContentAlignment="Center"
+                   Foreground="{DynamicResource subtleTextColor}" />
+
             <Canvas Canvas.Left="150"
                     Canvas.Top="10"
                     x:Name="copied"
@@ -418,5 +401,4 @@
             </Canvas>
         </Canvas>
     </Grid>
-    <!--ComputerInformation-->
 </UserControl>
diff --git a/UserControls/ComputerInformation.xaml.cs b/UserControls/ComputerInformation.xaml.cs
index c91dd9a..20db5ed 100644
--- a/UserControls/ComputerInformation.xaml.cs
+++ b/UserControls/ComputerInformation.xaml.cs
@@ -148,24 +148,50 @@ namespace C4IT_CustomerPanel.UserControls
                     RemoteHost = Environment.GetEnvironmentVariable("ClientName2");
 #endif
                 TxtHostname.Text = RemoteHost;
-                if (string.IsNullOrEmpty(RemoteHost))
-                    CanvasHostname.Visibility = Visibility.Collapsed;
+                CanvasHostname.Visibility = string.IsNullOrEmpty(RemoteHost)
+                    ? Visibility.Collapsed
+                    : Visibility.Visible;
                 TxtUsername.Text = Environment.UserDomainName + "\\" + Environment.UserName;
                 TxtIpaddress.Text = InformationHelper.GetIp4Address(MainWindow.MainInstance.ConfigSettings.ShowIpInfoOnlyInCorporateNetwork);
                 DriveInfo[] dInfo = InformationHelper.GetDrives();
                 TxtLastreboot.Text = InformationHelper.GetLastReboot().ToString(CultureInfo.CurrentUICulture);
 
+                StPaDrives.Children.Clear();
+                StPaDrives2.Children.Clear();
+
+                int fixedDriveCount = 0;
+                foreach (DriveInfo drive in dInfo)
+                {
+                    if (drive.DriveType == DriveType.Fixed)
+                        fixedDriveCount++;
+                }
+
+                int cardsPerRow = fixedDriveCount <= 1 ? 1 : 2;
+                double availableDriveWidth = StPaDrives.Width > 0 ? StPaDrives.Width : 334;
+                double driveCardWidth = Math.Max(120, (availableDriveWidth / cardsPerRow) - 4);
+
                 int k = 0;
                 foreach (DriveInfo drive in dInfo)
                 {
                     if ((drive.DriveType == DriveType.Fixed))
                     {
-                        Grid gri = new Grid { HorizontalAlignment = HorizontalAlignment.Center };
-                        Label lb = new Label { HorizontalAlignment = HorizontalAlignment.Center };
+                        Grid gri = new Grid
+                        {
+                            HorizontalAlignment = HorizontalAlignment.Stretch,
+                            Width = driveCardWidth
+                        };
+                        Label lb = new Label
+                        {
+                            HorizontalAlignment = HorizontalAlignment.Stretch,
+                            HorizontalContentAlignment = HorizontalAlignment.Center,
+                            FontSize = 11,
+                            Padding = new Thickness(2, 0, 2, 0)
+                        };
                         StackPanel sp = new StackPanel
                         {
-                            HorizontalAlignment = HorizontalAlignment.Center,
-                            Margin = new Thickness(10, 0, 0, 0)
+                            HorizontalAlignment = HorizontalAlignment.Left,
+                            Margin = new Thickness((k % cardsPerRow) == 0 ? 0 : 8, 0, 0, 0),
+                            Width = driveCardWidth
                         };
                         var pbg = new CustomProgressBar
                         {
@@ -174,10 +200,8 @@ namespace C4IT_CustomerPanel.UserControls
                         lb.Content = drive.Name + " - " + InformationHelper.FormatBytes(drive.TotalSize - drive.TotalFreeSpace, false) + " / " + InformationHelper.FormatBytes(drive.TotalSize, true);
                         lb.ToolTip = lb.Content;
                         lb.ClipToBounds = true;
-                        sp.Width = StPaDrives.Width / dInfo.Length;
-                        pbg.Width = sp.Width;
+                        pbg.Width = driveCardWidth;
                         pbg.Height = 20;
-                        sp.HorizontalAlignment = HorizontalAlignment.Center;
                         sp.Orientation = Orientation.Vertical;
                         gri.Children.Add(pbg);
                         pbg.ProgressValue = (int)((drive.TotalSize - drive.TotalFreeSpace) * 100 / drive.TotalSize);
@@ -194,11 +218,7 @@ namespace C4IT_CustomerPanel.UserControls
                         k++;
                     }
                 }
-                if (k <= 1)
-                {
-                    //                    StPaDrives2.Height = 0;
-                    //                    BtnRemoteSupport.Margin = new Thickness(0, -35, 0, 0);
-                }
+                StPaDrives2.Visibility = k > 2 ? Visibility.Visible : Visibility.Collapsed;
             }
             catch (Exception)
             {
diff --git a/UserControls/IncidentListItem.xaml b/UserControls/IncidentListItem.xaml
index fd75b06..71f6325 100644
--- a/UserControls/IncidentListItem.xaml
+++ b/UserControls/IncidentListItem.xaml
@@ -35,7 +35,24 @@
                     <ColumnDefinition Width="*"/>
                 </Grid.ColumnDefinitions>
                 <DockPanel Margin="-10,0,0,0">
-                    <Image Margin="5,0,5,0" Source="pack://application:,,,/Resources/StateOverlays/OverlayNewContentButton.png" Panel.ZIndex="18" Stretch="None" HorizontalAlignment="Center" VerticalAlignment="Center" Visibility="{Binding Path=IsUnread, Converter={StaticResource BoolToVis}}" x:Name="signal" Width="12" Height="12" Cursor="Hand" ToolTip="{x:Static resx:Resources.removeMarkup}"/>
+                    <Image Margin="5,0,5,0"
+                           Source="pack://application:,,,/Resources/StateOverlays/OverlayNewContentButton.png"
+                           Panel.ZIndex="18"
+                           Stretch="None"
+                           HorizontalAlignment="Center"
+                           VerticalAlignment="Center"
+                           Visibility="{Binding Path=IsUnread, Converter={StaticResource BoolToVis}}"
+                           x:Name="signal"
+                           Width="15"
+                           Height="15"
+                           Cursor="Hand"
+                           ToolTip="{x:Static resx:Resources.removeMarkup}"
+                           RenderTransformOrigin="0.5,0.5">
+                        <Image.RenderTransform>
+                            <ScaleTransform ScaleX="0.8"
+                                            ScaleY="0.8" />
+                        </Image.RenderTransform>
+                    </Image>
                     <TextBlock  x:Name="txtTicketType"  Margin="5,0,0,0" Grid.Column="0" HorizontalAlignment="Left" Text="{Binding Path=TicketType,FallbackValue='Störung'}" FontStyle="Italic" Foreground="{DynamicResource subtleTextColor}" Width="95"></TextBlock>
                 </DockPanel>
                 <DockPanel Grid.Column="1" Margin="10,0,0,0">