diff --git a/UWPX_UI/Controls/CustomSettingsTitleBarControl.xaml b/UWPX_UI/Controls/CustomSettingsTitleBarControl.xaml
index 7495ee70d..9fae6aff3 100644
--- a/UWPX_UI/Controls/CustomSettingsTitleBarControl.xaml
+++ b/UWPX_UI/Controls/CustomSettingsTitleBarControl.xaml
@@ -28,6 +28,7 @@
 
                 <Grid x:Name="titleBar_grid"
                       Grid.Row="0"
+                      VerticalAlignment="Stretch"
                       Background="Transparent">
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition x:Name="leftPaddingColumn"
diff --git a/UWPX_UI/Controls/CustomSettingsTitleBarControl.xaml.cs b/UWPX_UI/Controls/CustomSettingsTitleBarControl.xaml.cs
index edd49fa24..6de5f477e 100644
--- a/UWPX_UI/Controls/CustomSettingsTitleBarControl.xaml.cs
+++ b/UWPX_UI/Controls/CustomSettingsTitleBarControl.xaml.cs
@@ -130,7 +130,9 @@ private void UpdateTitleBarLayout(CoreApplicationViewTitleBar titleBar)
             titleBar_grid.Margin = new Thickness(0, -1, 0, 0);
 
             // Update title bar control size as needed to account for system size changes.
-            titleBar_grid.Height = titleBar.Height;
+            // Do not update the Height since it will be always 0 - bug
+            // Reference: https://wpdev.uservoice.com/forums/110705-universal-windows-platform/suggestions/15657012-titlebar-extendviewintotitlebar-in-anniv-update-b
+            // titleBar_grid.Height = titleBar.Height;
         }
 
         private void SetupKeyboardAccelerators()
diff --git a/UWPX_UI/Controls/CustomTitleBarControl.xaml b/UWPX_UI/Controls/CustomTitleBarControl.xaml
index 4944c5bdc..82ef3000d 100644
--- a/UWPX_UI/Controls/CustomTitleBarControl.xaml
+++ b/UWPX_UI/Controls/CustomTitleBarControl.xaml
@@ -1,35 +1,35 @@
-<UserControl
-    x:Class="UWPX_UI.Controls.CustomTitleBarControl"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="using:UWPX_UI.Controls"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    Background="{ThemeResource AppBackgroundAcrylicElementBrush}"
-    mc:Ignorable="d">
+<UserControl x:Class="UWPX_UI.Controls.CustomTitleBarControl"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:controls="using:UWPX_UI.Controls"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             Background="{ThemeResource AppBackgroundAcrylicElementBrush}"
+             mc:Ignorable="d">
 
     <Grid Background="{x:Bind Background, Mode=OneWay}">
         <Grid.RowDefinitions>
-            <RowDefinition Height="Auto" />
-            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="Auto"/>
         </Grid.RowDefinitions>
-        <Grid
-            x:Name="titleBar_grid"
-            Grid.Row="0"
-            Background="Transparent">
+        <Grid x:Name="titleBar_grid"
+              Grid.Row="0"
+              VerticalAlignment="Stretch"
+              Background="Transparent">
             <Grid.ColumnDefinitions>
-                <ColumnDefinition x:Name="leftPaddingColumn" Width="0" />
-                <ColumnDefinition />
-                <ColumnDefinition x:Name="rightPaddingColumn" Width="0" />
+                <ColumnDefinition x:Name="leftPaddingColumn"
+                                  Width="0"/>
+                <ColumnDefinition/>
+                <ColumnDefinition x:Name="rightPaddingColumn"
+                                  Width="0"/>
             </Grid.ColumnDefinitions>
         </Grid>
-        <Button
-            x:Name="backRequest_btn"
-            Grid.Row="0"
-            HorizontalAlignment="Left"
-            Click="BackRequest_btn_Click"
-            Style="{ThemeResource NavigationBackButtonSmallStyle}"
-            Visibility="{x:Bind BackRequestButtonVisibility, Mode=OneWay}" />
-        <controls:SeperatorControl Grid.Row="1" />
+        <Button x:Name="backRequest_btn"
+                Grid.Row="0"
+                HorizontalAlignment="Left"
+                Click="BackRequest_btn_Click"
+                Style="{ThemeResource NavigationBackButtonSmallStyle}"
+                Visibility="{x:Bind BackRequestButtonVisibility, Mode=OneWay}"/>
+        <controls:SeperatorControl Grid.Row="1"/>
     </Grid>
 </UserControl>
diff --git a/UWPX_UI/Controls/CustomTitleBarControl.xaml.cs b/UWPX_UI/Controls/CustomTitleBarControl.xaml.cs
index ac8a7f5e7..40edc27b8 100644
--- a/UWPX_UI/Controls/CustomTitleBarControl.xaml.cs
+++ b/UWPX_UI/Controls/CustomTitleBarControl.xaml.cs
@@ -114,6 +114,7 @@ private void UpdateTitleBarLayout()
             // Set XAML element as a draggable region.
             CoreApplicationViewTitleBar titleBar = CoreApplication.GetCurrentView().TitleBar;
             UpdateTitleBarLayout(titleBar);
+
             Window.Current.SetTitleBar(titleBar_grid);
             titleBar.LayoutMetricsChanged += TitleBar_LayoutMetricsChanged;
         }
@@ -127,7 +128,9 @@ private void UpdateTitleBarLayout(CoreApplicationViewTitleBar titleBar)
             titleBar_grid.Margin = new Thickness(0, -1, 0, 0);
 
             // Update title bar control size as needed to account for system size changes.
-            titleBar_grid.Height = titleBar.Height;
+            // Do not update the Height since it will be always 0 - bug
+            // Reference: https://wpdev.uservoice.com/forums/110705-universal-windows-platform/suggestions/15657012-titlebar-extendviewintotitlebar-in-anniv-update-b
+            // titleBar_grid.Height = titleBar.Height;
         }
 
         private void SetupKeyboardAccelerators()