diff --git a/src/Notepads/Controls/DiffViewer/SideBySideDiffViewer.xaml b/src/Notepads/Controls/DiffViewer/SideBySideDiffViewer.xaml
index 75cdd1464..407935940 100644
--- a/src/Notepads/Controls/DiffViewer/SideBySideDiffViewer.xaml
+++ b/src/Notepads/Controls/DiffViewer/SideBySideDiffViewer.xaml
@@ -1,116 +1,96 @@
-<UserControl
-    x:Class="Notepads.Controls.DiffViewer.SideBySideDiffViewer"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    mc:Ignorable="d"
-    Background="{ThemeResource SystemControlForegroundTransparentBrush}">
+<UserControl x:Class="Notepads.Controls.DiffViewer.SideBySideDiffViewer"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             mc:Ignorable="d">
 
     <UserControl.Resources>
         <ResourceDictionary>
             <ResourceDictionary.ThemeDictionaries>
-                <ResourceDictionary x:Key="Light">
-                    <SolidColorBrush x:Key="RightBoxBackgroundThemeBrush"
-                                     Opacity="0.25"
-                                     Color="White"/>
-                    <SolidColorBrush x:Key="HeaderBackgroundThemeBrush"
-                                     Opacity="0.35"
-                                     Color="LightGray"/>
-                </ResourceDictionary>
                 <ResourceDictionary x:Key="Dark">
-                    <SolidColorBrush x:Key="RightBoxBackgroundThemeBrush"
-                                  Opacity="0.15"
-                                  Color="Black"/>
-                    <SolidColorBrush x:Key="HeaderBackgroundThemeBrush"
-                                     Opacity="0.2"
-                                     Color="Black"/>
+                    <SolidColorBrush x:Key="HeaderBackgroundThemeBrush" Color="{StaticResource SystemAltHighColor}" Opacity="0.2" />
+                    <SolidColorBrush x:Key="RightBoxBackgroundThemeBrush" Color="{StaticResource SystemAltHighColor}" Opacity="0.15" />
+                </ResourceDictionary>
+                <ResourceDictionary x:Key="Light">
+                    <SolidColorBrush x:Key="HeaderBackgroundThemeBrush" Color="{StaticResource SystemBaseHighColor}" Opacity="0.05" />
+                    <SolidColorBrush x:Key="RightBoxBackgroundThemeBrush" Color="{StaticResource SystemAltHighColor}" Opacity="0.25" />
                 </ResourceDictionary>
                 <ResourceDictionary x:Key="HighContrast">
-                    <SolidColorBrush x:Key="RightBoxBackgroundThemeBrush"
-                                     Color="{ThemeResource SystemColorHighlightColor}"/>
-                    <SolidColorBrush x:Key="HeaderBackgroundThemeBrush"
-                                     Color="{ThemeResource SystemColorHighlightColor}"/>
+                    <SolidColorBrush x:Key="HeaderBackgroundThemeBrush" Color="{ThemeResource SystemColorWindowColor}" />
+                    <SolidColorBrush x:Key="RightBoxBackgroundThemeBrush" Color="{ThemeResource SystemColorWindowColor}" />
                 </ResourceDictionary>
             </ResourceDictionary.ThemeDictionaries>
         </ResourceDictionary>
-
     </UserControl.Resources>
+
     <Grid x:Name="LayoutRoot">
         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="*"/>
-            <ColumnDefinition Width="*"/>
+            <ColumnDefinition Width="*" />
+            <ColumnDefinition Width="*" />
         </Grid.ColumnDefinitions>
 
-        <Grid Column="0">
-
+        <Grid Grid.Column="0">
             <Grid.RowDefinitions>
-                <RowDefinition Height="25"/>
-                <RowDefinition Height="*"/>
+                <RowDefinition Height="Auto" MinHeight="24" />
+                <RowDefinition Height="*" />
             </Grid.RowDefinitions>
 
-            <Grid Row="0" Background="{ThemeResource HeaderBackgroundThemeBrush}">
-                <TextBlock Grid.Row="0"
-                           x:Uid="DiffViewer_Header_OldTextTittle"
-                           FontStyle="Italic"
-                           HorizontalAlignment="Center"
-                           VerticalAlignment="Center">
-                </TextBlock>
+            <Grid Grid.Row="0" Background="{ThemeResource HeaderBackgroundThemeBrush}">
                 <Button x:Name="DismissButton"
-                        VerticalAlignment="Center"
+                        x:Uid="FindAndReplace_DismissButton"
+                        Style="{StaticResource DismissButtonStyle}"
+                        Width="42"
                         HorizontalAlignment="Left"
-                        IsTabStop="False"
-                        Padding="0"
-                        Height="25"
-                        Width="32"
+                        VerticalAlignment="Stretch"
+                        Content="&#xE894;"
                         FontSize="12"
-                        Style="{StaticResource DismissButtonStyle}"
-                        Content="&#xE894;" 
-                        FontFamily="Segoe MDL2 Assets">
+                        IsTabStop="False">
                     <Button.KeyboardAccelerators>
-                        <KeyboardAccelerator Key="Escape"/>
+                        <KeyboardAccelerator Key="Escape" />
                     </Button.KeyboardAccelerators>
                 </Button>
+                <TextBlock x:Uid="DiffViewer_Header_OldTextTittle"
+                           HorizontalAlignment="Center"
+                           VerticalAlignment="Center"
+                           FontStyle="Italic"
+                           d:Text="Before your changes" />
             </Grid>
 
             <ScrollViewer Name="LeftScroller"
-                              Grid.Row="1"
-                              IsTabStop="False"
-                              Padding="6, 0, 8, 6"
-                              HorizontalScrollBarVisibility="Hidden"
-                              VerticalScrollBarVisibility="Hidden">
+                          Grid.Row="1"
+                          Padding="6,0,8,6"
+                          HorizontalScrollBarVisibility="Hidden"
+                          VerticalScrollBarVisibility="Hidden"
+                          IsTabStop="False">
                 <Border Name="LeftTextBlockBorder" Background="Transparent">
-                    <RichTextBlock Name="LeftTextBlock"
-                                   FontFamily="Consolas"/>
+                    <RichTextBlock Name="LeftTextBlock" FontFamily="Consolas" />
                 </Border>
             </ScrollViewer>
         </Grid>
 
-        <Grid Column="1" Background="{ThemeResource RightBoxBackgroundThemeBrush}">
-
+        <Grid Grid.Column="1" Background="{ThemeResource RightBoxBackgroundThemeBrush}">
             <Grid.RowDefinitions>
-                <RowDefinition Height="25"/>
-                <RowDefinition Height="*"/>
+                <RowDefinition Height="Auto" MinHeight="24" />
+                <RowDefinition Height="*" />
             </Grid.RowDefinitions>
 
-            <Grid Row="0" Background="{ThemeResource HeaderBackgroundThemeBrush}">
-                <TextBlock Grid.Row="0"
-                           x:Uid="DiffViewer_Header_NewTextTittle"
-                           FontStyle="Italic"
+            <Grid Grid.Row="0" Background="{ThemeResource HeaderBackgroundThemeBrush}">
+                <TextBlock x:Uid="DiffViewer_Header_NewTextTittle"
                            HorizontalAlignment="Center"
-                           VerticalAlignment="Center">
-                </TextBlock>
+                           VerticalAlignment="Center"
+                           FontStyle="Italic"
+                           d:Text="After your changes" />
             </Grid>
 
             <ScrollViewer Name="RightScroller"
                           Grid.Row="1"
-                          IsTabStop="False"
-                          Padding="6, 0, 8, 6"
+                          Padding="6,0,8,6"
                           HorizontalScrollBarVisibility="Auto"
-                          VerticalScrollBarVisibility="Auto">
+                          VerticalScrollBarVisibility="Auto"
+                          IsTabStop="False">
                 <Border Name="RightTextBlockBorder" Background="Transparent">
-                    <RichTextBlock Name="RightTextBlock"
-                                   FontFamily="Consolas"/>
+                    <RichTextBlock Name="RightTextBlock" FontFamily="Consolas" />
                 </Border>
             </ScrollViewer>
         </Grid>
diff --git a/src/Notepads/Controls/FindAndReplace/FindAndReplaceControl.xaml b/src/Notepads/Controls/FindAndReplace/FindAndReplaceControl.xaml
index b4cc714b3..0015256b3 100644
--- a/src/Notepads/Controls/FindAndReplace/FindAndReplaceControl.xaml
+++ b/src/Notepads/Controls/FindAndReplace/FindAndReplaceControl.xaml
@@ -1,92 +1,153 @@
-<UserControl
-    x:Class="Notepads.Controls.FindAndReplace.FindAndReplaceControl"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:findAndReplace="using:Notepads.Controls.FindAndReplace"
-    mc:Ignorable="d"
-    d:DesignHeight="72"
-    d:DesignWidth="250">
-
-    <Grid x:Name="FindAndReplaceRootGrid" KeyDown="FindAndReplaceRootGrid_KeyDown">
+<UserControl x:Class="Notepads.Controls.FindAndReplace.FindAndReplaceControl"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:findAndReplace="using:Notepads.Controls.FindAndReplace"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             HighContrastAdjustment="None"
+             d:DesignWidth="340"
+             d:DesignHeight="72"
+             mc:Ignorable="d">
 
+    <Grid x:Name="FindAndReplaceRootGrid"
+          Padding="1,1,1,1"
+          RowSpacing="4"
+          KeyDown="FindAndReplaceRootGrid_KeyDown">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+        </Grid.RowDefinitions>
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="Auto" />
             <ColumnDefinition Width="*" />
             <ColumnDefinition Width="Auto" />
         </Grid.ColumnDefinitions>
 
-        <Grid.RowDefinitions>
-            <RowDefinition Height="Auto" />
-            <RowDefinition Height="Auto" />
-        </Grid.RowDefinitions>
-
-        <Grid Grid.Row="0" Grid.Column="0" Padding="1, 1, 1, 1" Height="36" x:Name="ToggleReplaceModeButtonGrid">
+        <Grid x:Name="ToggleReplaceModeButtonGrid"
+              Grid.Row="0"
+              Grid.Column="0">
             <Button x:Name="ToggleReplaceModeButton"
                     x:Uid="FindAndReplace_ToggleReplaceModeButton"
-                    Grid.Column="0"
-                    IsTabStop="False"
+                    Style="{StaticResource DismissButtonStyle}"
                     Width="20"
-                    Padding="0"
+                    MinHeight="32"
+                    d:Content="&#xE76C;"
                     FontSize="12"
-                    Style="{StaticResource DismissButtonStyle}"
-                    Content="&#xE00F;"
-                    FontFamily="Segoe MDL2 Assets"
-                    Click="ToggleReplaceModeButton_OnClick">
-            </Button>
+                    Click="ToggleReplaceModeButton_OnClick"
+                    IsTabStop="False" />
         </Grid>
 
-        <RelativePanel Grid.Row="0" Grid.Column="1" Padding="1, 1, 1, 1" Height="36" x:Name="FindBarPlaceHolder">
-
+        <RelativePanel x:Name="FindBarPlaceHolder"
+                       Grid.Row="0"
+                       Grid.Column="1">
             <findAndReplace:FindAndReplaceTextBox x:Name="FindBar"
                                                   x:Uid="FindAndReplace_FindBar"
-                                                  Style="{StaticResource TransparentTextBoxStyle}"
-                                                  Foreground="{ThemeResource SystemControlHighlightChromeAltLowBrush}"
                                                   RelativePanel.AlignLeftWithPanel="True"
                                                   RelativePanel.AlignRightWithPanel="True"
+                                                  Style="{StaticResource TransparentTextBoxStyle}"
+                                                  Foreground="{ThemeResource SystemControlHighlightChromeAltLowBrush}"
+                                                  BorderThickness="0"
+                                                  Padding="10,3,32,6"
                                                   HorizontalAlignment="Stretch"
                                                   VerticalAlignment="Stretch"
-                                                  Padding="10,3,32,6"
-                                                  IsSpellCheckEnabled="False"
-                                                  TextAlignment="Left"
-                                                  BorderThickness="0"
                                                   FontSize="15"
-                                                  TextChanged="FindBar_OnTextChanged"
-                                                  KeyDown="FindBar_OnKeyDown"
+                                                  TextAlignment="Left"
                                                   GotFocus="FindBar_GotFocus"
-                                                  LostFocus="FindBar_LostFocus"/>
+                                                  IsSpellCheckEnabled="False"
+                                                  KeyDown="FindBar_OnKeyDown"
+                                                  LostFocus="FindBar_LostFocus"
+                                                  d:PlaceholderText="Find"
+                                                  TextChanged="FindBar_OnTextChanged" />
+
+            <Grid x:Name="OptionButtonGrid" RelativePanel.AlignRightWithPanel="True">
+                <Line x:Name="OptionButtonSelectionIndicator"
+                      X1="16" Y1="24"
+                      X2="16" Y2="24"
+                      Stroke="{ThemeResource SystemControlHighlightAccentBrush}"
+                      StrokeThickness="2"
+                      StrokeStartLineCap="Round"
+                      StrokeEndLineCap="Round"
+                      Visibility="Collapsed"
+                      d:Visibility="Visible"
+                      IsHitTestVisible="False">
+                    <Line.Resources>
+                        <Storyboard x:Name="OptionButtonSelectionIndicatorLineVisible">
+                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="OptionButtonSelectionIndicator" Storyboard.TargetProperty="Visibility">
+                                <DiscreteObjectKeyFrame KeyTime="0" Value="Visible" />
+                            </ObjectAnimationUsingKeyFrames>
+                            <DoubleAnimationUsingKeyFrames Storyboard.TargetName="OptionButtonSelectionIndicator" Storyboard.TargetProperty="X1" EnableDependentAnimation="True">
+                                <DiscreteDoubleKeyFrame KeyTime="0" Value="16" />
+                                <EasingDoubleKeyFrame KeyTime="00:00:00.500" Value="9">
+                                    <EasingDoubleKeyFrame.EasingFunction>
+                                        <BackEase Amplitude="0.75" EasingMode="EaseOut" />
+                                    </EasingDoubleKeyFrame.EasingFunction>
+                                </EasingDoubleKeyFrame>
+                            </DoubleAnimationUsingKeyFrames>
+                            <DoubleAnimationUsingKeyFrames Storyboard.TargetName="OptionButtonSelectionIndicator" Storyboard.TargetProperty="X2" EnableDependentAnimation="True">
+                                <DiscreteDoubleKeyFrame KeyTime="0" Value="16" />
+                                <EasingDoubleKeyFrame KeyTime="00:00:00.500" Value="23">
+                                    <EasingDoubleKeyFrame.EasingFunction>
+                                        <BackEase Amplitude="0.75" EasingMode="EaseOut" />
+                                    </EasingDoubleKeyFrame.EasingFunction>
+                                </EasingDoubleKeyFrame>
+                            </DoubleAnimationUsingKeyFrames>
+                        </Storyboard>
 
-            <Grid RelativePanel.AlignRightWithPanel="True" x:Name="OptionButtonGrid" Background="Transparent">
-                <Border x:Name="OptionButtonSelectionIndicator"
-                        BorderBrush="{StaticResource SystemControlBackgroundAccentBrush}" 
-                        VerticalAlignment="Bottom" 
-                        BorderThickness="1" 
-                        Margin="9"
-                        Visibility="Collapsed"/>
+                        <Storyboard x:Name="OptionButtonSelectionIndicatorLineCollapsed">
+                            <DoubleAnimationUsingKeyFrames Storyboard.TargetName="OptionButtonSelectionIndicator" Storyboard.TargetProperty="X1" EnableDependentAnimation="True">
+                                <DiscreteDoubleKeyFrame KeyTime="0" Value="9" />
+                                <EasingDoubleKeyFrame KeyTime="00:00:00.500" Value="16">
+                                    <EasingDoubleKeyFrame.EasingFunction>
+                                        <BackEase Amplitude="0.75" EasingMode="EaseIn" />
+                                    </EasingDoubleKeyFrame.EasingFunction>
+                                </EasingDoubleKeyFrame>
+                            </DoubleAnimationUsingKeyFrames>
+                            <DoubleAnimationUsingKeyFrames Storyboard.TargetName="OptionButtonSelectionIndicator" Storyboard.TargetProperty="X2" EnableDependentAnimation="True">
+                                <DiscreteDoubleKeyFrame KeyTime="0" Value="23" />
+                                <EasingDoubleKeyFrame KeyTime="00:00:00.500" Value="16">
+                                    <EasingDoubleKeyFrame.EasingFunction>
+                                        <BackEase Amplitude="0.75" EasingMode="EaseIn" />
+                                    </EasingDoubleKeyFrame.EasingFunction>
+                                </EasingDoubleKeyFrame>
+                            </DoubleAnimationUsingKeyFrames>
+                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="OptionButtonSelectionIndicator" Storyboard.TargetProperty="Visibility">
+                                <DiscreteObjectKeyFrame KeyTime="00:0:00.500" Value="Collapsed" />
+                            </ObjectAnimationUsingKeyFrames>
+                        </Storyboard>
+                    </Line.Resources>
+                </Line>
                 <Button x:Name="OptionButton"
                         x:Uid="FindAndReplace_SearchOptionButton"
-                        IsTabStop="False"
-                        Width="36"
-                        FontSize="16"
                         Style="{StaticResource DismissButtonStyle}"
-                        Content="&#xE712;" 
-                        FontFamily="Segoe MDL2 Assets">
+                        Width="32"
+                        Height="32"
+                        Content="&#xE712;"
+                        FontSize="16"
+                        IsTabStop="False">
                     <Button.Flyout>
                         <MenuFlyout Placement="BottomEdgeAlignedRight">
-                            <ToggleMenuFlyoutItem x:Uid="FindAndReplace_SearchOptionToggleButton_MatchCase" x:Name="MatchCaseToggle" Click="OptionButtonFlyoutItem_OnClick">
+                            <ToggleMenuFlyoutItem x:Name="MatchCaseToggle"
+                                                  x:Uid="FindAndReplace_SearchOptionToggleButton_MatchCase"
+                                                  Click="OptionButtonFlyoutItem_OnClick"
+                                                  HighContrastAdjustment="None">
                                 <ToggleMenuFlyoutItem.KeyboardAccelerators>
-                                    <KeyboardAccelerator Modifiers="Menu" Key="C"/>
+                                    <KeyboardAccelerator Modifiers="Menu" Key="C" />
                                 </ToggleMenuFlyoutItem.KeyboardAccelerators>
                             </ToggleMenuFlyoutItem>
-                            <ToggleMenuFlyoutItem x:Uid="FindAndReplace_SearchOptionToggleButton_MatchWholeWord" x:Name="MatchWholeWordToggle" Click="OptionButtonFlyoutItem_OnClick">
+                            <ToggleMenuFlyoutItem x:Name="MatchWholeWordToggle"
+                                                  x:Uid="FindAndReplace_SearchOptionToggleButton_MatchWholeWord"
+                                                  Click="OptionButtonFlyoutItem_OnClick"
+                                                  HighContrastAdjustment="None">
                                 <ToggleMenuFlyoutItem.KeyboardAccelerators>
-                                    <KeyboardAccelerator Modifiers="Menu" Key="W"/>
+                                    <KeyboardAccelerator Modifiers="Menu" Key="W" />
                                 </ToggleMenuFlyoutItem.KeyboardAccelerators>
                             </ToggleMenuFlyoutItem>
-                            <ToggleMenuFlyoutItem x:Uid="FindAndReplace_SearchOptionToggleButton_UseRegex" x:Name="UseRegexToggle" Click="OptionButtonFlyoutItem_OnClick">
+                            <ToggleMenuFlyoutItem x:Name="UseRegexToggle"
+                                                  x:Uid="FindAndReplace_SearchOptionToggleButton_UseRegex"
+                                                  Click="OptionButtonFlyoutItem_OnClick"
+                                                  HighContrastAdjustment="None">
                                 <ToggleMenuFlyoutItem.KeyboardAccelerators>
-                                    <KeyboardAccelerator Modifiers="Menu" Key="E"/>
+                                    <KeyboardAccelerator Modifiers="Menu" Key="E" />
                                 </ToggleMenuFlyoutItem.KeyboardAccelerators>
                             </ToggleMenuFlyoutItem>
                         </MenuFlyout>
@@ -95,25 +156,9 @@
             </Grid>
         </RelativePanel>
 
-        <Grid Grid.Row="1" Grid.Column="1" Padding="1, 1, 1, 1" Height="36" x:Name="ReplaceBarPlaceHolder">
-            <findAndReplace:FindAndReplaceTextBox x:Name="ReplaceBar"
-                                                  x:Uid="FindAndReplace_ReplaceBar"
-                                                  Style="{StaticResource TransparentTextBoxStyle}"
-                                                  Foreground="{ThemeResource SystemControlHighlightChromeAltLowBrush}"
-                                                  HorizontalAlignment="Stretch"
-                                                  VerticalAlignment="Stretch"
-                                                  IsSpellCheckEnabled="False"
-                                                  TextAlignment="Left"
-                                                  BorderThickness="0"
-                                                  FontSize="15"
-                                                  TextChanged="ReplaceBar_OnTextChanged"
-                                                  KeyDown="ReplaceBar_OnKeyDown"
-                                                  GotFocus="ReplaceBar_GotFocus"
-                                                  LostFocus="ReplaceBar_LostFocus"/>
-        </Grid>
-
-        <Grid Grid.Row="0" Grid.Column="2" Padding="1, 1, 1, 1" Height="36">
-
+        <Grid Grid.Row="0"
+              Grid.Column="2"
+              Padding="2,0,0,0">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="Auto" />
                 <ColumnDefinition Width="Auto" />
@@ -122,51 +167,71 @@
 
             <Button x:Name="SearchBackwardButton"
                     x:Uid="FindAndReplace_SearchBackwardButton"
+                    Grid.Column="0"
+                    Style="{StaticResource DismissButtonStyle}"
                     Width="36"
-                    Grid.Column="0" 
-                    IsEnabled="False"
-                    IsTabStop="False"
+                    Height="32"
+                    Content="&#xE74A;"
                     FontSize="16"
-                    Style="{StaticResource DismissButtonStyle}"
-                    Content="&#xE110;" 
-                    FontFamily="Segoe MDL2 Assets"
-                    Click="SearchBackwardButton_OnClick">
+                    Click="SearchBackwardButton_OnClick"
+                    IsEnabled="False"
+                    IsTabStop="False">
                 <Button.KeyboardAccelerators>
-                    <KeyboardAccelerator Modifiers="Shift" Key="F3"/>
+                    <KeyboardAccelerator Modifiers="Shift" Key="F3" />
                 </Button.KeyboardAccelerators>
             </Button>
 
             <Button x:Name="SearchForwardButton"
                     x:Uid="FindAndReplace_SearchForwardButton"
-                    Width="36"
                     Grid.Column="1"
-                    IsEnabled="False"
-                    IsTabStop="False"
-                    FontSize="16"
                     Style="{StaticResource DismissButtonStyle}"
-                    Content="&#xE74B;" 
-                    FontFamily="Segoe MDL2 Assets"
-                    Click="SearchForwardButton_OnClick">
+                    Width="36"
+                    Height="32"
+                    Content="&#xE74B;"
+                    FontSize="16"
+                    Click="SearchForwardButton_OnClick"
+                    IsEnabled="False"
+                    IsTabStop="False">
                 <Button.KeyboardAccelerators>
-                    <KeyboardAccelerator Key="F3"/>
+                    <KeyboardAccelerator Key="F3" />
                 </Button.KeyboardAccelerators>
             </Button>
 
             <Button x:Name="DismissButton"
                     x:Uid="FindAndReplace_DismissButton"
-                    IsTabStop="False"
+                    Grid.Column="2"
+                    Style="{StaticResource DismissButtonStyle}"
                     Width="36"
-                    Grid.Column="2" 
+                    Height="32"
+                    Content="&#xE894;"
                     FontSize="16"
-                    Style="{StaticResource DismissButtonStyle}"
-                    Content="&#xE894;" 
-                    FontFamily="Segoe MDL2 Assets" 
-                    Click="DismissButton_OnClick" >
-            </Button>
+                    Click="DismissButton_OnClick"
+                    IsTabStop="False" />
         </Grid>
 
-        <Grid Grid.Row="1" Grid.Column="2" Padding="1, 1, 1, 1" Height="36">
+        <Grid x:Name="ReplaceBarPlaceHolder"
+              Grid.Row="1"
+              Grid.Column="1">
+            <findAndReplace:FindAndReplaceTextBox x:Name="ReplaceBar"
+                                                  x:Uid="FindAndReplace_ReplaceBar"
+                                                  Style="{StaticResource TransparentTextBoxStyle}"
+                                                  Foreground="{ThemeResource SystemControlHighlightChromeAltLowBrush}"
+                                                  BorderThickness="0"
+                                                  HorizontalAlignment="Stretch"
+                                                  VerticalAlignment="Stretch"
+                                                  FontSize="15"
+                                                  TextAlignment="Left"
+                                                  GotFocus="ReplaceBar_GotFocus"
+                                                  IsSpellCheckEnabled="False"
+                                                  KeyDown="ReplaceBar_OnKeyDown"
+                                                  LostFocus="ReplaceBar_LostFocus"
+                                                  d:PlaceholderText="Replace"
+                                                  TextChanged="ReplaceBar_OnTextChanged" />
+        </Grid>
 
+        <Grid Grid.Row="1"
+              Grid.Column="2"
+              Padding="2,0,0,0">
             <Grid>
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="Auto" />
@@ -175,33 +240,33 @@
 
                 <Button x:Name="ReplaceButton"
                         x:Uid="FindAndReplace_ReplaceButton"
-                        IsEnabled="False"
-                        IsTabStop="False"
-                        Width="36"
-                        Grid.Column="0" 
-                        FontSize="16"
+                        Grid.Column="0"
                         Style="{StaticResource DismissButtonStyle}"
+                        Width="36"
+                        Height="32"
                         Content="&#xE8AB;"
-                        FontFamily="Segoe MDL2 Assets"
-                        Click="ReplaceButton_OnClick">
+                        FontSize="16"
+                        Click="ReplaceButton_OnClick"
+                        IsEnabled="False"
+                        IsTabStop="False">
                     <Button.KeyboardAccelerators>
-                        <KeyboardAccelerator Modifiers="Menu" Key="R"/>
+                        <KeyboardAccelerator Modifiers="Menu" Key="R" />
                     </Button.KeyboardAccelerators>
                 </Button>
 
                 <Button x:Name="ReplaceAllButton"
                         x:Uid="FindAndReplace_ReplaceAllButton"
-                        IsEnabled="False"
-                        IsTabStop="False"
+                        Grid.Column="1"
+                        Style="{StaticResource DismissButtonStyle}"
                         Width="36"
-                        Grid.Column="1" 
+                        Height="32"
+                        Content="&#xE7FD;"
                         FontSize="16"
-                        Style="{StaticResource DismissButtonStyle}"
-                        Content="&#xE7FD;" 
-                        FontFamily="Segoe MDL2 Assets"
-                        Click="ReplaceAllButton_OnClick">
+                        Click="ReplaceAllButton_OnClick"
+                        IsEnabled="False"
+                        IsTabStop="False">
                     <Button.KeyboardAccelerators>
-                        <KeyboardAccelerator Modifiers="Control,Menu" Key="Enter"/>
+                        <KeyboardAccelerator Modifiers="Control,Menu" Key="Enter" />
                     </Button.KeyboardAccelerators>
                 </Button>
             </Grid>
diff --git a/src/Notepads/Controls/FindAndReplace/FindAndReplaceControl.xaml.cs b/src/Notepads/Controls/FindAndReplace/FindAndReplaceControl.xaml.cs
index 18cf21b3f..6367221e7 100644
--- a/src/Notepads/Controls/FindAndReplace/FindAndReplaceControl.xaml.cs
+++ b/src/Notepads/Controls/FindAndReplace/FindAndReplaceControl.xaml.cs
@@ -77,13 +77,15 @@ private async void ThemeSettingsService_OnAccentColorChanged(object sender, Colo
 
         public double GetHeight(bool showReplaceBar)
         {
+            double FindAndReplaceRootGridHeight = 36;
+
             if (showReplaceBar)
             {
-                return FindBarPlaceHolder.Height + ReplaceBarPlaceHolder.Height;
+                return FindAndReplaceRootGridHeight + FindAndReplaceRootGridHeight;
             }
             else
             {
-                return FindBarPlaceHolder.Height;
+                return FindAndReplaceRootGridHeight;
             }
         }
 
@@ -116,7 +118,8 @@ public void ShowReplaceBar(bool showReplaceBar)
             if (showReplaceBar)
             {
                 ToggleReplaceModeButtonGrid.SetValue(Grid.RowSpanProperty, 2);
-                ToggleReplaceModeButton.Content = new FontIcon { Glyph = "\xE011", FontSize = 12 };
+                ToggleReplaceModeButton.VerticalAlignment = VerticalAlignment.Stretch;
+                ToggleReplaceModeButton.Content = "\uE70D";
                 ReplaceBarPlaceHolder.Visibility = Visibility.Visible;
                 if (!string.IsNullOrEmpty(FindBar.Text))
                 {
@@ -127,7 +130,8 @@ public void ShowReplaceBar(bool showReplaceBar)
             else
             {
                 ToggleReplaceModeButtonGrid.SetValue(Grid.RowSpanProperty, 1);
-                ToggleReplaceModeButton.Content = new FontIcon { Glyph = "\xE00F", FontSize = 12 };
+                ToggleReplaceModeButton.VerticalAlignment = VerticalAlignment.Top;
+                ToggleReplaceModeButton.Content = "\uE76C";
                 ReplaceBarPlaceHolder.Visibility = Visibility.Collapsed;
                 ReplaceButton.IsEnabled = false;
                 ReplaceAllButton.IsEnabled = false;
@@ -272,11 +276,11 @@ private void OptionButtonFlyoutItem_OnClick(object sender, RoutedEventArgs e)
 
             if (MatchCaseToggle.IsChecked || MatchWholeWordToggle.IsChecked || UseRegexToggle.IsChecked)
             {
-                OptionButtonSelectionIndicator.Visibility = Visibility.Visible;
+                OptionButtonSelectionIndicatorLineVisible.Begin();
             }
             else
             {
-                OptionButtonSelectionIndicator.Visibility = Visibility.Collapsed;
+                OptionButtonSelectionIndicatorLineCollapsed.Begin();
             }
         }
 
diff --git a/src/Notepads/Controls/GoTo/GoToControl.xaml b/src/Notepads/Controls/GoTo/GoToControl.xaml
index 296793793..fd9a59ae1 100644
--- a/src/Notepads/Controls/GoTo/GoToControl.xaml
+++ b/src/Notepads/Controls/GoTo/GoToControl.xaml
@@ -1,14 +1,17 @@
-<UserControl
-    x:Class="Notepads.Controls.GoTo.GoToControl"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    mc:Ignorable="d"
-    d:DesignWidth="250" Height="36">
+<UserControl x:Class="Notepads.Controls.GoTo.GoToControl"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             HighContrastAdjustment="None"
+             d:DesignWidth="260"
+             d:DesignHeight="36"
+             mc:Ignorable="d">
 
-    <Grid Padding="1, 1, 1, 1" Height="36" x:Name="GoToRootGrid" KeyDown="GoToRootGrid_KeyDown">
-        
+    <Grid x:Name="GoToRootGrid"
+          Height="36"
+          Padding="1,1,1,1"
+          KeyDown="GoToRootGrid_KeyDown">
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="Auto" />
             <ColumnDefinition Width="*" />
@@ -16,49 +19,56 @@
             <ColumnDefinition Width="Auto" />
         </Grid.ColumnDefinitions>
 
-        <TextBlock Grid.Column="0" x:Uid="GoTo_GoToBarLabel" Margin="5,0,8,3" FontSize="15" VerticalAlignment="Center" TextAlignment="Center"/>
+        <TextBlock x:Uid="GoTo_GoToBarLabel"
+                   Grid.Column="0"
+                   Margin="6,0,8,5"
+                   VerticalAlignment="Center"
+                   d:Text="Go To:"
+                   FontSize="15" />
 
-        <Grid Grid.Column="1">
-            <TextBox x:Name="GoToBar"
-                     x:Uid="GoTo_GoToBar"
-                     Style="{StaticResource TransparentTextBoxStyle}"
-                     Foreground="{ThemeResource SystemControlHighlightChromeAltLowBrush}"
-                     HorizontalAlignment="Stretch"
-                     VerticalAlignment="Stretch"
-                     IsSpellCheckEnabled="False"
-                     TextAlignment="Left"
-                     BorderThickness="0"
-                     FontSize="15"
-                     BeforeTextChanging="GoToBar_BeforeTextChanging"
-                     TextChanged="GoToBar_OnTextChanged"
-                     KeyDown="GoToBar_OnKeyDown"
-                     GotFocus="GoToBar_GotFocus"
-                     LostFocus="GoToBar_LostFocus"/>
-        </Grid>
+        <TextBox x:Name="GoToBar"
+                 x:Uid="GoTo_GoToBar"
+                 Grid.Column="1"
+                 Style="{StaticResource TransparentTextBoxStyle}"
+                 Foreground="{ThemeResource SystemControlHighlightChromeAltLowBrush}"
+                 BorderThickness="0"
+                 HorizontalAlignment="Stretch"
+                 VerticalAlignment="Top"
+                 FontSize="15"
+                 TextAlignment="Left"
+                 BeforeTextChanging="GoToBar_BeforeTextChanging"
+                 GotFocus="GoToBar_GotFocus"
+                 InputScope="Number"
+                 IsSpellCheckEnabled="False"
+                 KeyDown="GoToBar_OnKeyDown"
+                 LostFocus="GoToBar_LostFocus"
+                 d:PlaceholderText="Go To Line"
+                 TextChanged="GoToBar_OnTextChanged" />
 
         <Button x:Name="SearchButton"
                 x:Uid="GoTo_SearchButton"
+                Grid.Column="2"
+                Style="{StaticResource DismissButtonStyle}"
                 Width="36"
-                Grid.Column="2" 
-                Visibility="Collapsed"
-                IsTabStop="False"
+                Height="32"
+                VerticalAlignment="Top"
+                Content="&#xEBE7;"
                 FontSize="16"
-                Style="{StaticResource DismissButtonStyle}"
-                Content="&#xEBE7;" 
-                FontFamily="Segoe MDL2 Assets"
-                Click="SearchButton_OnClick">
-        </Button>
+                Visibility="Collapsed"
+                d:Visibility="Visible"
+                Click="SearchButton_OnClick"
+                IsTabStop="False" />
 
         <Button x:Name="DismissButton"
                 x:Uid="FindAndReplace_DismissButton"
-                IsTabStop="False"
+                Grid.Column="3"
+                Style="{StaticResource DismissButtonStyle}"
                 Width="36"
-                Grid.Column="3" 
+                Height="32"
+                VerticalAlignment="Top"
+                Content="&#xE894;"
                 FontSize="16"
-                Style="{StaticResource DismissButtonStyle}"
-                Content="&#xE894;" 
-                FontFamily="Segoe MDL2 Assets" 
-                Click="DismissButton_OnClick" >
-        </Button>
+                Click="DismissButton_OnClick"
+                IsTabStop="False" />
     </Grid>
 </UserControl>
diff --git a/src/Notepads/Resource/DismissButtonStyle.xaml b/src/Notepads/Resource/DismissButtonStyle.xaml
index eb87ae7a1..8ce87e3a5 100644
--- a/src/Notepads/Resource/DismissButtonStyle.xaml
+++ b/src/Notepads/Resource/DismissButtonStyle.xaml
@@ -1,59 +1,81 @@
-<ResourceDictionary
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" 
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="using:Notepads">
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:local="using:Notepads">
 
-    <Style x:Key="DismissButtonStyle" TargetType="ButtonBase">
-        <Setter Property="Background" Value="{ThemeResource HyperlinkButtonBackground}" />
-        <Setter Property="Foreground" Value="{ThemeResource ApplicationForegroundThemeBrush}" />
-        <Setter Property="Width" Value="40" />
-        <Setter Property="Height" Value="40" />
-        <Setter Property="UseSystemFocusVisuals" Value="True" />
-        <Setter Property="HighContrastAdjustment" Value="None" />
+    <Style x:Key="DismissButtonStyle" TargetType="Button">
+        <Setter Property="Background" Value="{ThemeResource SystemControlTransparentBrush}" />
+        <Setter Property="BackgroundSizing" Value="OuterBorderEdge" />
+        <Setter Property="BorderBrush" Value="{ThemeResource HyperlinkButtonBorderBrush}" />
+        <Setter Property="Padding" Value="0" />
+        <Setter Property="FontFamily" Value="{ThemeResource SymbolThemeFontFamily}" />
+        <Setter Property="FontSize" Value="16" />
         <Setter Property="Template">
             <Setter.Value>
-                <ControlTemplate TargetType="ButtonBase">
-                    <Grid x:Name="RootGrid" Margin="{TemplateBinding Padding}" Background="{TemplateBinding Background}">
-                        <Border x:Name="TextBorder" BorderThickness="2" BorderBrush="Transparent">
-                            <ContentPresenter x:Name="Text"
-                                                      Content="{TemplateBinding Content}"
-                                                      HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                                      VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
-                        </Border>
+                <ControlTemplate TargetType="Button">
+                    <Grid x:Name="ButtonLayoutGrid"
+                          Background="{TemplateBinding Background}"
+                          BackgroundSizing="{TemplateBinding BackgroundSizing}"
+                          BorderBrush="{TemplateBinding BorderBrush}"
+                          BorderThickness="{TemplateBinding BorderThickness}"
+                          CornerRadius="{TemplateBinding CornerRadius}">
+                        <Grid.BackgroundTransition>
+                            <BrushTransition />
+                        </Grid.BackgroundTransition>
+
+                        <TextBlock x:Name="GlyphElement"
+                                   Foreground="{TemplateBinding Foreground}"
+                                   HorizontalAlignment="Center"
+                                   VerticalAlignment="Center"
+                                   FontFamily="{TemplateBinding FontFamily}"
+                                   FontSize="{TemplateBinding FontSize}"
+                                   FontStyle="Normal"
+                                   Text="{TemplateBinding Content}"
+                                   IsTextScaleFactorEnabled="False"
+                                   AutomationProperties.AccessibilityView="Raw" />
+
                         <VisualStateManager.VisualStateGroups>
                             <VisualStateGroup x:Name="CommonStates">
                                 <VisualState x:Name="Normal" />
+
                                 <VisualState x:Name="PointerOver">
                                     <Storyboard>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Text" Storyboard.TargetProperty="Foreground">
-                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SystemListMediumColor}" />
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ButtonLayoutGrid" Storyboard.TargetProperty="Background">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SystemControlTransparentBrush}" />
                                         </ObjectAnimationUsingKeyFrames>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="RootGrid" Storyboard.TargetProperty="Background">
-                                            <DiscreteObjectKeyFrame KeyTime="0" Value="Transparent" />
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ButtonLayoutGrid" Storyboard.TargetProperty="BorderBrush">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource HyperlinkButtonBorderBrushPointerOver}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="GlyphElement" Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource HyperlinkButtonForegroundPointerOver}" />
                                         </ObjectAnimationUsingKeyFrames>
                                     </Storyboard>
                                 </VisualState>
+
                                 <VisualState x:Name="Pressed">
                                     <Storyboard>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Text" Storyboard.TargetProperty="Foreground">
-                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SystemListMediumColor}" />
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ButtonLayoutGrid" Storyboard.TargetProperty="Background">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SystemControlTransparentBrush}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ButtonLayoutGrid" Storyboard.TargetProperty="BorderBrush">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource HyperlinkButtonBorderBrushPressed}" />
                                         </ObjectAnimationUsingKeyFrames>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="RootGrid" Storyboard.TargetProperty="Background">
-                                            <DiscreteObjectKeyFrame KeyTime="0" Value="Transparent" />
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="GlyphElement" Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource HyperlinkButtonForegroundPressed}" />
                                         </ObjectAnimationUsingKeyFrames>
                                     </Storyboard>
                                 </VisualState>
+
                                 <VisualState x:Name="Disabled">
                                     <Storyboard>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Text" Storyboard.TargetProperty="Foreground">
-                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource HyperlinkButtonForegroundDisabled}" />
-                                        </ObjectAnimationUsingKeyFrames>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Text" Storyboard.TargetProperty="Background">
-                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource HyperlinkButtonBackgroundDisabled}" />
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ButtonLayoutGrid" Storyboard.TargetProperty="Background">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SystemControlTransparentBrush}" />
                                         </ObjectAnimationUsingKeyFrames>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Text" Storyboard.TargetProperty="BorderBrush">
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ButtonLayoutGrid" Storyboard.TargetProperty="BorderBrush">
                                             <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource HyperlinkButtonBorderBrushDisabled}" />
                                         </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="GlyphElement" Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource HyperlinkButtonForegroundDisabled}" />
+                                        </ObjectAnimationUsingKeyFrames>
                                     </Storyboard>
                                 </VisualState>
                             </VisualStateGroup>