diff --git a/MainWindow.xaml b/MainWindow.xaml
index eb76519..1383a0c 100644
--- a/MainWindow.xaml
+++ b/MainWindow.xaml
@@ -192,6 +192,14 @@
                 </Trigger>
             </Style.Triggers>
         </Style>
+        <Style TargetType="Button"
+               x:Key="PrimaryActionButtonStyle"
+               BasedOn="{StaticResource ButtonStyle}">
+            <Setter Property="Background"
+                    Value="{DynamicResource activeButtonColor}" />
+            <Setter Property="BorderBrush"
+                    Value="{DynamicResource activeButtonColor}" />
+        </Style>
         <Style TargetType="Button"
                x:Key="FlatButtonStyle2">
             <Setter Property="FontSize"
diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs
index 1401f6f..6d95945 100644
--- a/MainWindow.xaml.cs
+++ b/MainWindow.xaml.cs
@@ -1117,9 +1117,8 @@ namespace C4IT_CustomerPanel
                         btn.Content = pair.Value;
                         btn.Width = 320;
                         btn.Height = 40;
-                        btn.FontSize = 18;
-                        //btn.Background = ConfigSettings.GetInactiveButtonColor();
-                        btn.Style = FindResource("ButtonStyle") as Style;
+                        btn.FontSize = 16;
+                        btn.Style = FindResource("PrimaryActionButtonStyle") as Style;
                         btn.Margin = new Thickness(15, 10, 0, 0);
                         btn.PreviewMouseDown += OnCustomButtonClick;
                         CustomLinksCtrl.AddLink(btn);
diff --git a/UserControls/ComputerInformation.xaml b/UserControls/ComputerInformation.xaml
index d67dc68..5fa8f7e 100644
--- a/UserControls/ComputerInformation.xaml
+++ b/UserControls/ComputerInformation.xaml
@@ -334,8 +334,7 @@
                            Canvas.Top="0"
                            HorizontalContentAlignment="Center" />
                     <Button Foreground="{DynamicResource buttonTextColor}"
-                            Style="{StaticResource ButtonStyle}"
-                            Background="{DynamicResource activeButtonColor}"
+                            Style="{DynamicResource PrimaryActionButtonStyle}"
                             Width="250"
                             Height="36"
                             x:Name="BtnClientReport"
diff --git a/UserControls/Incidents.xaml b/UserControls/Incidents.xaml
index 4054e71..96e6db5 100644
--- a/UserControls/Incidents.xaml
+++ b/UserControls/Incidents.xaml
@@ -84,7 +84,7 @@
             <ScrollViewer x:Name="CanvasIncident"
                           Canvas.Top="56"
                           Canvas.Left="0"
-                          MaxHeight="410"
+                          MaxHeight="448"
                           MinHeight="60"
                           HorizontalScrollBarVisibility="Disabled"
                           VerticalScrollBarVisibility="Auto"
@@ -107,14 +107,13 @@
                 </Border>
             </StackPanel>
             <Button Foreground="{DynamicResource buttonTextColor}"
-                    Style="{StaticResource ButtonStyle}"
-                    Background="{DynamicResource activeButtonColor}"
-                    Canvas.Top="476"
-                    Canvas.Left="62"
-                    Width="250"
+                    Style="{DynamicResource PrimaryActionButtonStyle}"
+                    Canvas.Top="510"
+                    Canvas.Left="15"
+                    Width="320"
                     Height="40"
                     Content="{x:Static resx:Resources.createNewTicket}"
-                    FontSize="18"
+                    FontSize="16"
                     x:Name="BtnCreateNewTicket"
                     Click="OnCreateNewTicketClicked"
                     Margin="0" />
diff --git a/UserControls/PortalSearch.xaml b/UserControls/PortalSearch.xaml
index 3ea254b..96f187f 100644
--- a/UserControls/PortalSearch.xaml
+++ b/UserControls/PortalSearch.xaml
@@ -127,8 +127,7 @@
                     Canvas.Left="0"
                     Width="350"
                     Height="360">
-                <Button Style="{StaticResource ButtonStyle}"
-                        Background="{DynamicResource activeButtonColor}"
+                <Button Style="{DynamicResource PrimaryActionButtonStyle}"
                         x:Name="BtnSspLink"
                         x:FieldModifier="private"
                         Width="320"
@@ -141,8 +140,7 @@
                 <Button Foreground="{DynamicResource buttonTextColor}"
                         x:Name="BtnMyserviceLink"
                         x:FieldModifier="private"
-                        Style="{StaticResource ButtonStyle}"
-                        Background="{DynamicResource activeButtonColor}"
+                        Style="{DynamicResource PrimaryActionButtonStyle}"
                         Width="320"
                         Canvas.Left="15"
                         Height="40"