diff --git a/MessageTextPage.xaml b/MessageTextPage.xaml
index c09347c6a2bd687c7a685bbf226ed064567acc97..5cfa805aac02c76cf9106277199acd4341a30f7c 100644
--- a/MessageTextPage.xaml
+++ b/MessageTextPage.xaml
@@ -87,11 +87,11 @@
                             <Border x:Name="BackgroundElement"
                                     Grid.Row="1"
                                     Background="{TemplateBinding Background}"
-                                    Margin="{TemplateBinding BorderThickness}"
+                                    Margin="0"
                                     Opacity="1"
                                     Grid.ColumnSpan="2"
                                     BorderBrush="#3bc1d3"
-                                    BorderThickness="1"
+                                    BorderThickness="0"
                                     Grid.RowSpan="1"/>
                             <ScrollViewer x:Name="ContentElement"
                                           Grid.Row="1"
@@ -110,6 +110,7 @@
 
                             <Button x:Name="_sendBtn_"
                                     Background="Transparent"
+                                    BorderThickness="0"
                                     Grid.Row="1"
                                     FontFamily="Segoe MDL2 Assets"
                                     Foreground="#3bc1d3"
@@ -262,7 +263,7 @@
                      HorizontalAlignment="Stretch"
                      TextWrapping="NoWrap"
                      VerticalAlignment="Center"
-                     Margin="10"
+                     Margin="8,6,8,6"
                      Background="White"
                      KeyDown="_messageTextBox__KeyDown"/>
         </Grid>
diff --git a/VideoPage.xaml b/VideoPage.xaml
index 5a13ca7bf3df281b0b0e97fbd55953db7fbe8a39..7fee9c175ae4505f7f24bcdb50f4c2cc6e7bb2fb 100644
--- a/VideoPage.xaml
+++ b/VideoPage.xaml
@@ -105,11 +105,11 @@
                             <Border x:Name="BackgroundElement"
                                     Grid.Row="1"
                                     Background="{TemplateBinding Background}"
-                                    Margin="{TemplateBinding BorderThickness}"
+                                    Margin="0"
                                     Opacity="1"
                                     Grid.ColumnSpan="2"
                                     BorderBrush="#3bc1d3"
-                                    BorderThickness="1"
+                                    BorderThickness="0"
                                     Grid.RowSpan="1"/>
                             <ScrollViewer x:Name="ContentElement"
                                           Grid.Row="1"
@@ -128,6 +128,7 @@
 
                             <Button x:Name="_sendBtn_"
                                     Background="Transparent"
+                                    BorderThickness="0"
                                     Grid.Row="1"
                                     FontFamily="Segoe MDL2 Assets"
                                     Foreground="#3bc1d3"
@@ -405,7 +406,7 @@
                                         HorizontalAlignment="Stretch"
                                         TextWrapping="NoWrap"
                                         VerticalAlignment="Bottom"
-                                        Margin="10"
+                                        Margin="8,6,8,6"
                                         Background="White"
                                         KeyDown="_messageTextBox__KeyDown"/>
                         </Grid>