Index: Core/Common/src/Core.Common.Gui/Forms/SplashScreen/SplashScreen.xaml
===================================================================
diff -u -r8facffc48a20cd49759e32aea1ecc100047c68a2 -rc2ea25a7c137c0b98a51734ca53674ddabb5164f
--- Core/Common/src/Core.Common.Gui/Forms/SplashScreen/SplashScreen.xaml	(.../SplashScreen.xaml)	(revision 8facffc48a20cd49759e32aea1ecc100047c68a2)
+++ Core/Common/src/Core.Common.Gui/Forms/SplashScreen/SplashScreen.xaml	(.../SplashScreen.xaml)	(revision c2ea25a7c137c0b98a51734ca53674ddabb5164f)
@@ -16,7 +16,7 @@
 
         <Label x:Name="LabelProgressMessage" Content="{x:Static Properties:Resources.SplashScreen_Starting}" HorizontalAlignment="Left" VerticalAlignment="Top" FontSize="9px" Foreground="Black" FontFamily="Arial" Grid.Row="1" Padding="0" Margin="7,0,0,0"/>
 
-        <ProgressBar x:Name="ProgressBar" HorizontalAlignment="Center" Height="12" VerticalAlignment="Center" Width="482" Value="55" Background="White" Opacity="0.8" Foreground="#FF8094A8" IsTabStop="False" Grid.Row="2">
+        <ProgressBar x:Name="ProgressBar" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Value="55" Background="White" Opacity="0.8" Foreground="#FF8094A8" IsTabStop="False" Grid.Row="2" Margin="7,0">
             <ProgressBar.BorderBrush>
                 <LinearGradientBrush EndPoint="0,1" StartPoint="0,0">
                     <GradientStop Color="#FF8094A8" Offset="0"/>
@@ -25,7 +25,7 @@
             </ProgressBar.BorderBrush>
 
         </ProgressBar>
-        <Label x:Name="LabelProgressBar" Content="0 %" VerticalAlignment="Bottom" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" FontSize="9px" HorizontalAlignment="Center" x:FieldModifier="protected" Grid.Row="2"  Width="25" Padding="0" />
+        <Label x:Name="LabelProgressBar" Content="0 %" VerticalAlignment="Bottom" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" FontSize="9px" HorizontalAlignment="Center" x:FieldModifier="protected" Grid.Row="2" Padding="0" />
 
         <Grid Grid.Row="3" Margin="10,5,0,0" VerticalAlignment="Center">
             <Grid.ColumnDefinitions>
Index: Core/Common/src/Core.Common.Gui/Forms/SplashScreen/SplashScreen.xaml.cs
===================================================================
diff -u -r8facffc48a20cd49759e32aea1ecc100047c68a2 -rc2ea25a7c137c0b98a51734ca53674ddabb5164f
--- Core/Common/src/Core.Common.Gui/Forms/SplashScreen/SplashScreen.xaml.cs	(.../SplashScreen.xaml.cs)	(revision 8facffc48a20cd49759e32aea1ecc100047c68a2)
+++ Core/Common/src/Core.Common.Gui/Forms/SplashScreen/SplashScreen.xaml.cs	(.../SplashScreen.xaml.cs)	(revision c2ea25a7c137c0b98a51734ca53674ddabb5164f)
@@ -241,7 +241,7 @@
 
         private void SetSupportValues()
         {
-            var supportVisibility = !(String.IsNullOrWhiteSpace(SupportPhoneNumber) && String.IsNullOrWhiteSpace(SupportEmail)) ? Visibility.Visible : Visibility.Collapsed;
+            var supportVisibility = (String.IsNullOrWhiteSpace(SupportPhoneNumber) || String.IsNullOrWhiteSpace(SupportEmail)) ? Visibility.Collapsed : Visibility.Visible;
 
             LabelSupportTitle.Visibility = supportVisibility;
             LabelSupportPhoneNumberTitle.Visibility = supportVisibility;
Index: Core/Common/test/Core.Common.Gui.Test/Forms/SplashScreen/SplashScreenTest.cs
===================================================================
diff -u -r8facffc48a20cd49759e32aea1ecc100047c68a2 -rc2ea25a7c137c0b98a51734ca53674ddabb5164f
--- Core/Common/test/Core.Common.Gui.Test/Forms/SplashScreen/SplashScreenTest.cs	(.../SplashScreenTest.cs)	(revision 8facffc48a20cd49759e32aea1ecc100047c68a2)
+++ Core/Common/test/Core.Common.Gui.Test/Forms/SplashScreen/SplashScreenTest.cs	(.../SplashScreenTest.cs)	(revision c2ea25a7c137c0b98a51734ca53674ddabb5164f)
@@ -64,14 +64,18 @@
         }
 
         [Test]
-        [TestCase(true)]
-        [TestCase(false)]
+        [TestCase(true, true, true)]
+        [TestCase(true, false, false)]
+        [TestCase(false, true, false)]
+        [TestCase(false, false, false)]
         [RequiresSTA]
-        public void ViewPropertiesVisibility_SupportValuesSet_SupportValuesShouldBeVisible(bool supportVisible)
+        public void ViewPropertiesVisibility_SupportValuesSet_SupportValuesShouldBeVisible(
+            bool emailVisible, bool phoneVisible,
+            bool supportUiElementsShouldBeVisible)
         {
             // Setup
-            var supportEmail = supportVisible ? "<email>" : string.Empty;
-            var supportPhone = supportVisible ? "<phone>" : string.Empty;
+            var supportEmail = emailVisible ? "<email>" : string.Empty;
+            var supportPhone = phoneVisible ? "<phone>" : string.Empty;
 
             // Call
             var screen = new Gui.Forms.SplashScreen.SplashScreen
@@ -82,11 +86,11 @@
             screen.Show();
 
             // Assert
-            Assert.AreEqual(supportVisible, GetIsControlVisible(screen, "LabelSupportTitle"));
-            Assert.AreEqual(supportVisible, GetIsControlVisible(screen, "LabelSupportPhoneNumberTitle"));
-            Assert.AreEqual(supportVisible, GetIsControlVisible(screen, "LabelSupportPhoneNumber"));
-            Assert.AreEqual(supportVisible, GetIsControlVisible(screen, "LabelSupportEmailAddressTitle"));
-            Assert.AreEqual(supportVisible, GetIsControlVisible(screen, "LabelSupportEmailAddress"));
+            Assert.AreEqual(supportUiElementsShouldBeVisible, GetIsControlVisible(screen, "LabelSupportTitle"));
+            Assert.AreEqual(supportUiElementsShouldBeVisible, GetIsControlVisible(screen, "LabelSupportPhoneNumberTitle"));
+            Assert.AreEqual(supportUiElementsShouldBeVisible, GetIsControlVisible(screen, "LabelSupportPhoneNumber"));
+            Assert.AreEqual(supportUiElementsShouldBeVisible, GetIsControlVisible(screen, "LabelSupportEmailAddressTitle"));
+            Assert.AreEqual(supportUiElementsShouldBeVisible, GetIsControlVisible(screen, "LabelSupportEmailAddress"));
 
             // Teardown
             screen.Close();