diff --git a/config/themes.json b/config/themes.json
index ab00a421..af7358d3 100644
--- a/config/themes.json
+++ b/config/themes.json
@@ -48,7 +48,7 @@
 
                     "SearchBarWidth":               "200",
                     "SearchBarHeight":              "25",
-                    "SearchBarTextBoxFontSize":     "16",
+                    "SearchBarTextBoxFontSize":     "12",
                     "SearchBarClearButtonFontSize": "14",
 
                     "ButtonInstallBackgroundColor":  "#FFFFFF",
@@ -122,7 +122,7 @@
 
                     "SearchBarWidth":               "200",
                     "SearchBarHeight":              "25",
-                    "SearchBarTextBoxFontSize":     "16",
+                    "SearchBarTextBoxFontSize":     "12",
                     "SearchBarClearButtonFontSize": "14",
 
                     "ButtonInstallBackgroundColor":  "#222222",
@@ -195,7 +195,7 @@
 
                     "SearchBarWidth":               "200",
                     "SearchBarHeight":              "25",
-                    "SearchBarTextBoxFontSize":     "16",
+                    "SearchBarTextBoxFontSize":     "12",
                     "SearchBarClearButtonFontSize": "14",
 
                     "ButtonInstallBackgroundColor": "#222222",
diff --git a/xaml/inputXML.xaml b/xaml/inputXML.xaml
index c91eac65..02fedf8b 100644
--- a/xaml/inputXML.xaml
+++ b/xaml/inputXML.xaml
@@ -677,19 +677,18 @@
                     Consider using a Math Solver, will help in making
                     development of these things much easier
                 -->
-                <!-- Changed the font size from {SearchBarTextBoxFontSize} to 12. This now display the text box correctly in the text box.-->
                 <TextBox
                     Grid.Column="0"
                     Width="{SearchBarWidth}"
                     Height="{SearchBarHeight}"
-                    FontSize="12"
+                    FontSize="{SearchBarTextBoxFontSize}"
                     VerticalAlignment="Center" HorizontalAlignment="Left"
                     BorderThickness="1"
                     Name="SearchBar"
                     Foreground="{MainForegroundColor}" Background="{MainBackgroundColor}"
+                    Padding="3,3,0,0"
                     ToolTip="Press Ctrl-F and type app name to filter application list below. Press Esc to reset the filter">
                 </TextBox>
-                <!--Changed the margin from 16 to 180, which now places the magnifying glass icon on the right side of the text box. Now able to see what is been searched for.-->
                 <TextBlock
                     Grid.Column="0"
                     VerticalAlignment="Center" HorizontalAlignment="Left"
@@ -703,7 +702,6 @@
                     Consider using a Math Solver, will help in making
                     development of these things much easier
                 -->
-                <!-- changed the {SearchBarClearButtonMargin} value from 193 to 205, which now places the clear button on the outside of the text box. -->
                 <Button Grid.Column="0"
                     VerticalAlignment="Center" HorizontalAlignment="Left"
                     Name="SearchBarClearButton"