diff --git a/src/AccessibilityInsights.SharedUx/Controls/HierarchyControl.xaml b/src/AccessibilityInsights.SharedUx/Controls/HierarchyControl.xaml
index 16b1d0a97..89d6104f9 100644
--- a/src/AccessibilityInsights.SharedUx/Controls/HierarchyControl.xaml
+++ b/src/AccessibilityInsights.SharedUx/Controls/HierarchyControl.xaml
@@ -88,7 +88,7 @@
                 <ColumnDefinition Width="*"/>
                 <ColumnDefinition Width="Auto"/>
             </Grid.ColumnDefinitions>
-            <Border Height="24" Margin="8,5,8,5" Background="{DynamicResource ResourceKey=SearchPanelBGBrush}" BorderBrush="{DynamicResource ResourceKey=SearchPanelBorderBrush}" BorderThickness="{DynamicResource ResourceKey=SearchPanelBorderThickness}">
+            <Border Height="24" Margin="8,5,8,5" Background="{DynamicResource ResourceKey=SearchPanelBGBrush}" BorderBrush="{DynamicResource ResourceKey=SearchPanelBorderBrush}" BorderThickness="1">
                 <DockPanel>
                     <controls:FabricIconControl DockPanel.Dock="Left" Margin="5,0,5,0" GlyphName="Search" FontSize="{StaticResource ConstStandardTextSize}" GlyphSize="Custom" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="{DynamicResource ResourceKey=IconBrush}" ShowInControlView="False"/>
                     <controls:PlaceholderTextBox x:Name="textboxSearch" TextChanged="textboxSearch_TextChanged"
diff --git a/src/AccessibilityInsights.SharedUx/Resources/Dark/Brushes.xaml b/src/AccessibilityInsights.SharedUx/Resources/Dark/Brushes.xaml
index 2d6de3261..681c853fa 100644
--- a/src/AccessibilityInsights.SharedUx/Resources/Dark/Brushes.xaml
+++ b/src/AccessibilityInsights.SharedUx/Resources/Dark/Brushes.xaml
@@ -76,7 +76,6 @@
     <SolidColorBrush po:Freeze="True" x:Key="TestViewTabItemSelectedFGBrush" Color="#FFFFFF"/>
 
     <!-- NEW SETTINGS -->
-    <Thickness po:Freeze="True" x:Key="SearchPanelBorderThickness">1</Thickness>          <!-- (UPDATED) Thickness of border around search panel -->
     <Thickness po:Freeze="True" x:Key="TestModeBorderThickness">0</Thickness>             <!-- (UPDATED) Thickness of border around test mode view -->
     <Thickness po:Freeze="True" x:Key="ActionsButtonBorderThickness">0</Thickness>        <!-- Thickness of border around Actions buttons (patterns view) -->
 
diff --git a/src/AccessibilityInsights.SharedUx/Resources/HighContrast/Brushes.xaml b/src/AccessibilityInsights.SharedUx/Resources/HighContrast/Brushes.xaml
index 8765fb436..cecc1c5e9 100644
--- a/src/AccessibilityInsights.SharedUx/Resources/HighContrast/Brushes.xaml
+++ b/src/AccessibilityInsights.SharedUx/Resources/HighContrast/Brushes.xaml
@@ -63,7 +63,6 @@
     <SolidColorBrush po:Freeze="True" x:Key="TestViewTabItemSelectedFGBrush" Color="{x:Static SystemColors.HighlightTextColor}"/>
 
     <!-- NEW SETTINGS -->
-    <Thickness po:Freeze="True" x:Key="SearchPanelBorderThickness">0</Thickness>
     <Thickness po:Freeze="True" x:Key="TestModeBorderThickness">1</Thickness>
     <Thickness po:Freeze="True" x:Key="ActionsButtonBorderThickness">1</Thickness>
 
@@ -72,7 +71,7 @@
     <SolidColorBrush x:Key="SearchAndIconForegroundBrush" Color="{x:Static SystemColors.ControlTextColor}"/>
     <SolidColorBrush x:Key="SearchPlaceholderFGBrush" Color="{x:Static SystemColors.ControlTextColor}"/>
     <SolidColorBrush x:Key="SearchPanelBGBrush" Color="Transparent"/>
-    <SolidColorBrush x:Key="SearchPanelBorderBrush" Color="Transparent"/>
+    <SolidColorBrush x:Key="SearchPanelBorderBrush" Color="{x:Static SystemColors.ControlTextColor}"/>
     <SolidColorBrush x:Key="GenericBorderBrush" Color="#A6A6A6 "/>  <!-- TODO: Find better value for this? -->
     <SolidColorBrush x:Key="StartupBackgroundBrush" Color="#0C5086 "/>
     <SolidColorBrush x:Key="StartupVideoBorder" Color="#403E3E "/>
diff --git a/src/AccessibilityInsights.SharedUx/Resources/Light/Brushes.xaml b/src/AccessibilityInsights.SharedUx/Resources/Light/Brushes.xaml
index 972e9dbcb..984bb47f6 100644
--- a/src/AccessibilityInsights.SharedUx/Resources/Light/Brushes.xaml
+++ b/src/AccessibilityInsights.SharedUx/Resources/Light/Brushes.xaml
@@ -76,7 +76,6 @@
     <SolidColorBrush po:Freeze="True" x:Key="TestViewTabItemSelectedFGBrush" Color="#000000"/>
 
     <!-- NEW SETTINGS -->
-    <Thickness po:Freeze="True" x:Key="SearchPanelBorderThickness">0</Thickness>
     <Thickness po:Freeze="True" x:Key="TestModeBorderThickness">1</Thickness>
     <Thickness po:Freeze="True" x:Key="ActionsButtonBorderThickness">0</Thickness>
 
@@ -85,7 +84,7 @@
     <SolidColorBrush x:Key="SearchAndIconForegroundBrush" Color="#333333"/>
     <SolidColorBrush x:Key="SearchPlaceholderFGBrush" Color="#333333"/>
     <SolidColorBrush x:Key="SearchPanelBGBrush" Color="#F4F4F4"/>
-    <SolidColorBrush x:Key="SearchPanelBorderBrush" Color="Transparent"/>
+    <SolidColorBrush x:Key="SearchPanelBorderBrush" Color="#000000"/>
     <SolidColorBrush x:Key="GenericBorderBrush" Color="#A6A6A6"/>
     <SolidColorBrush x:Key="StartupBackgroundBrush" Color="#0C5086"/>
     <SolidColorBrush x:Key="StartupVideoBorder" Color="#403E3E"/>