diff --git a/Subsurface/Content/LargeFont.spritefont b/Subsurface/Content/LargeFont.spritefont
index 20619a92c..fa7bd48f1 100644
--- a/Subsurface/Content/LargeFont.spritefont
+++ b/Subsurface/Content/LargeFont.spritefont
@@ -8,7 +8,7 @@ with.
 <XnaContent xmlns:Graphics="Microsoft.Xna.Framework.Content.Pipeline.Graphics">
   <Asset Type="Graphics:FontDescription">
 
-    <FontName>Verdana</FontName>
+    <FontName>Code Pro Bold</FontName>
 
     <Size>16</Size>
 
diff --git a/Subsurface/Content/LargeFont.xnb b/Subsurface/Content/LargeFont.xnb
index 9982c5a6a..c7acfd769 100644
Binary files a/Subsurface/Content/LargeFont.xnb and b/Subsurface/Content/LargeFont.xnb differ
diff --git a/Subsurface/Content/SmallFont.spritefont b/Subsurface/Content/SmallFont.spritefont
index 90f94d0fe..d28c47076 100644
--- a/Subsurface/Content/SmallFont.spritefont
+++ b/Subsurface/Content/SmallFont.spritefont
@@ -8,9 +8,9 @@ with.
 <XnaContent xmlns:Graphics="Microsoft.Xna.Framework.Content.Pipeline.Graphics">
   <Asset Type="Graphics:FontDescription">
 
-    <FontName>Verdana</FontName>
+    <FontName>Exo Light</FontName>
 
-    <Size>7</Size>
+    <Size>9</Size>
 
     <Spacing>0</Spacing>
 
diff --git a/Subsurface/Content/SmallFont.xnb b/Subsurface/Content/SmallFont.xnb
index ba3695382..d796cb96f 100644
Binary files a/Subsurface/Content/SmallFont.xnb and b/Subsurface/Content/SmallFont.xnb differ
diff --git a/Subsurface/Content/SpriteFont1.spritefont b/Subsurface/Content/SpriteFont1.spritefont
index 38a11178c..5e812c263 100644
--- a/Subsurface/Content/SpriteFont1.spritefont
+++ b/Subsurface/Content/SpriteFont1.spritefont
@@ -11,13 +11,13 @@ with.
     <!--
     Modify this string to change the font that will be imported.
     -->
-    <FontName>Verdana</FontName>
+    <FontName>Exo Medium</FontName>
 
     <!--
     Size is a float value, measured in points. Modify this value to change
     the size of the font.
     -->
-    <Size>12</Size>
+    <Size>10</Size>
 
     <!--
     Spacing is a float value, measured in pixels. Modify this value to change
diff --git a/Subsurface/Content/SpriteFont1.xnb b/Subsurface/Content/SpriteFont1.xnb
index 5723d1238..9f5a8945a 100644
Binary files a/Subsurface/Content/SpriteFont1.xnb and b/Subsurface/Content/SpriteFont1.xnb differ
diff --git a/Subsurface/Source/GameMain.cs b/Subsurface/Source/GameMain.cs
index 47ca750eb..fb6ac0329 100644
--- a/Subsurface/Source/GameMain.cs
+++ b/Subsurface/Source/GameMain.cs
@@ -238,7 +238,9 @@ namespace Barotrauma
             while (!SoundPlayer.Initialized)
             {
                 i++;
-                TitleScreen.LoadState = Math.Min((float)TitleScreen.LoadState + 0.5f*i, 70.0f);
+                TitleScreen.LoadState = SoundPlayer.SoundCount == 0 ? 
+                    30.0f :
+                    Math.Min(30.0f + 40.0f * i / Math.Max(SoundPlayer.SoundCount, 1), 70.0f);
                 yield return CoroutineStatus.Running;
             }
 
diff --git a/Subsurface/Source/Sounds/SoundPlayer.cs b/Subsurface/Source/Sounds/SoundPlayer.cs
index a25b40c00..517da436b 100644
--- a/Subsurface/Source/Sounds/SoundPlayer.cs
+++ b/Subsurface/Source/Sounds/SoundPlayer.cs
@@ -90,11 +90,18 @@ namespace Barotrauma
             get;
             set;
         }
+
+        public static int SoundCount;
         
         public static IEnumerable<object> Init()
         {
             OverrideMusicType = null;
 
+            XDocument doc = ToolBox.TryLoadXml("Content/Sounds/sounds.xml");
+            if (doc == null) yield return CoroutineStatus.Failure;
+
+            SoundCount = 16 + doc.Root.Elements().Count();
+
             startDrone = Sound.Load("Content/Sounds/startDrone.ogg", false);
             startDrone.Play();
 
@@ -116,12 +123,7 @@ namespace Barotrauma
                 SplashSounds[i] = Sound.Load("Content/Sounds/Water/Splash"+(i)+".ogg", false);
                 yield return CoroutineStatus.Running;
             }
-
-            XDocument doc = ToolBox.TryLoadXml("Content/Sounds/sounds.xml");
-            if (doc == null) yield return CoroutineStatus.Failure;
-
-            yield return CoroutineStatus.Running;
-
+            
             var xMusic = doc.Root.Elements("music").ToList();
 
             if (xMusic.Any())
@@ -178,8 +180,7 @@ namespace Barotrauma
                 }
             }
 
-            miscSounds = miscSoundList.ToLookup(kvp => kvp.Key, kvp => kvp.Value);
-            
+            miscSounds = miscSoundList.ToLookup(kvp => kvp.Key, kvp => kvp.Value);            
 
             Initialized = true;