diff --git a/apps/openmw/mwsound/ffmpeg_decoder.cpp b/apps/openmw/mwsound/ffmpeg_decoder.cpp
index 00530a9628..54df45ff4c 100644
--- a/apps/openmw/mwsound/ffmpeg_decoder.cpp
+++ b/apps/openmw/mwsound/ffmpeg_decoder.cpp
@@ -153,6 +153,10 @@ void FFmpeg_Decoder::open(const std::string &fname)
 
     try
     {
+        for(size_t j = 0;j < mFormatCtx->nb_streams;j++)
+            if(mFormatCtx->streams[j]->codec->codec_type == AVMEDIA_TYPE_AUDIO)
+                mFormatCtx->streams[j]->codec->request_sample_fmt = AV_SAMPLE_FMT_S16;
+
         if(avformat_find_stream_info(mFormatCtx, NULL) < 0)
             fail("Failed to find stream info in "+fname);
 
diff --git a/cmake/FindFFmpeg.cmake b/cmake/FindFFmpeg.cmake
index c80203a25b..4147590d60 100644
--- a/cmake/FindFFmpeg.cmake
+++ b/cmake/FindFFmpeg.cmake
@@ -68,6 +68,7 @@ macro(find_component _component _pkgconfig _library _header)
 
   find_path(${_component}_INCLUDE_DIRS ${_header}
     HINTS
+      ${FFMPEGSDK_INC}
       ${PC_LIB${_component}_INCLUDEDIR}
       ${PC_LIB${_component}_INCLUDE_DIRS}
     PATH_SUFFIXES
@@ -76,6 +77,7 @@ macro(find_component _component _pkgconfig _library _header)
 
   find_library(${_component}_LIBRARIES NAMES ${_library}
       HINTS
+      ${FFMPEGSDK_LIB}
       ${PC_LIB${_component}_LIBDIR}
       ${PC_LIB${_component}_LIBRARY_DIRS}
   )
@@ -97,6 +99,12 @@ endmacro()
 # Check for cached results. If there are skip the costly part.
 if (NOT FFMPEG_LIBRARIES)
 
+  set (FFMPEGSDK ENV${FFMPEG_HOME})
+  if (FFMPEGSDK)
+    set (FFMPEGSDK_INC "${FFMPEGSDK}/include")
+    set (FFMPEGSDK_LIB "${FFMPEGSDK}/lib")
+  endif ()
+
   # Check for all possible component.
   find_component(AVCODEC  libavcodec  avcodec  libavcodec/avcodec.h)
   find_component(AVFORMAT libavformat avformat libavformat/avformat.h)
diff --git a/credits.txt b/credits.txt
index 8b396aad0a..535e922ae1 100644
--- a/credits.txt
+++ b/credits.txt
@@ -29,6 +29,7 @@ Jannik Heller (scrawl)
 Jason Hooks (jhooks)
 Joel Graff (graffy)
 Karl-Felix Glatzer (k1ll)
+Lars Söderberg (Lazaroth)
 lazydev
 Leon Saunders (emoose)
 Lukasz Gromanowski (lgro)
diff --git a/files/mygui/openmw_hud_box.skin.xml b/files/mygui/openmw_hud_box.skin.xml
index ce231e5bb9..464b6343aa 100644
--- a/files/mygui/openmw_hud_box.skin.xml
+++ b/files/mygui/openmw_hud_box.skin.xml
@@ -2,76 +2,78 @@
 
 <MyGUI type="Skin">
     <!-- The 'box' frame that surrounds various HUD items and other elements -->
-    <Skin name="HUD_Box" size="40 40" texture="textures\menu_icon_equip.dds">
-        <BasisSkin type="TileRect" offset="0 0 40 2" align="ALIGN_TOP ALIGN_HSTRETCH">
-            <State name="normal" offset="2 2 40 2">
+    <Skin name="HUD_Box" size="40 40" texture="mwgui.png">
+
+        <BasisSkin type="TileRect" offset="0 0 39 2" align="ALIGN_TOP ALIGN_HSTRETCH">
+            <State name="normal" offset="4 2 38 2">
                 <Property key="TileSize" value="40 2"/>
                 <Property key="TileH" value="true"/>
                 <Property key="TileV" value="true"/>
             </State>
         </BasisSkin>
 
-        <BasisSkin type="TileRect" offset="0 38 40 2" align="ALIGN_BOTTOM ALIGN_HSTRETCH">
-            <State name="normal" offset="2 40 40 2">
+        <BasisSkin type="TileRect" offset="0 1 2 37" align="ALIGN_LEFT ALIGN_VSTRETCH">
+            <State name="normal" offset="2 26 2 36">
+                <Property key="TileSize" value="2 40"/>
+                <Property key="TileH" value="true"/>
+                <Property key="TileV" value="true"/>
+            </State>
+        </BasisSkin>
+
+        <BasisSkin type="TileRect" offset="38 0 2 40" align="ALIGN_RIGHT ALIGN_VSTRETCH">
+            <State name="normal" offset="16 26 2 38">
+                <Property key="TileSize" value="2 40"/>
+                <Property key="TileH" value="true"/>
+                <Property key="TileV" value="true"/>
+            </State>
+        </BasisSkin>
+        
+        <BasisSkin type="TileRect" offset="0 38 39 2" align="ALIGN_BOTTOM ALIGN_HSTRETCH">
+            <State name="normal" offset="4 20 40 2">
                 <Property key="TileSize" value="40 2"/>
                 <Property key="TileH" value="true"/>
                 <Property key="TileV" value="true"/>
             </State>
         </BasisSkin>
-
-        <BasisSkin type="TileRect" offset="0 2 2 36" align="ALIGN_LEFT ALIGN_VSTRETCH">
-            <State name="normal" offset="2 4 2 36">
-                <Property key="TileSize" value="2 36"/>
-                <Property key="TileH" value="true"/>
-                <Property key="TileV" value="true"/>
-            </State>
-        </BasisSkin>
-
-        <BasisSkin type="TileRect" offset="38 2 2 36" align="ALIGN_RIGHT ALIGN_VSTRETCH">
-            <State name="normal" offset="40 4 2 36">
-                <Property key="TileSize" value="2 36"/>
-                <Property key="TileH" value="true"/>
-                <Property key="TileV" value="true"/>
-            </State>
-        </BasisSkin>
-
+        
         <!-- The interior of the box -->
         <Child type="Widget" skin="BlackBG" offset="2 2 36 36" align="ALIGN_STRETCH" name="Client"/>
     </Skin>
 
-    <Skin name="HUD_Box_NoTransp" size="40 40" texture="textures\menu_icon_equip.dds">
-        <BasisSkin type="TileRect" offset="0 0 40 2" align="ALIGN_TOP ALIGN_HSTRETCH">
-            <State name="normal" offset="2 2 40 2">
+    <Skin name="HUD_Box_NoTransp" size="40 40" texture="mwgui.png">
+    
+        <BasisSkin type="TileRect" offset="0 0 39 2" align="ALIGN_TOP ALIGN_HSTRETCH">
+            <State name="normal" offset="4 2 38 2">
                 <Property key="TileSize" value="40 2"/>
                 <Property key="TileH" value="true"/>
                 <Property key="TileV" value="true"/>
             </State>
         </BasisSkin>
 
-        <BasisSkin type="TileRect" offset="0 38 40 2" align="ALIGN_BOTTOM ALIGN_HSTRETCH">
-            <State name="normal" offset="2 40 40 2">
+        <BasisSkin type="TileRect" offset="0 1 2 37" align="ALIGN_LEFT ALIGN_VSTRETCH">
+            <State name="normal" offset="2 26 2 36">
+                <Property key="TileSize" value="2 40"/>
+                <Property key="TileH" value="true"/>
+                <Property key="TileV" value="true"/>
+            </State>
+        </BasisSkin>
+
+        <BasisSkin type="TileRect" offset="38 0 2 40" align="ALIGN_RIGHT ALIGN_VSTRETCH">
+            <State name="normal" offset="16 26 2 38">
+                <Property key="TileSize" value="2 40"/>
+                <Property key="TileH" value="true"/>
+                <Property key="TileV" value="true"/>
+            </State>
+        </BasisSkin>
+        
+        <BasisSkin type="TileRect" offset="0 38 39 2" align="ALIGN_BOTTOM ALIGN_HSTRETCH">
+            <State name="normal" offset="4 20 40 2">
                 <Property key="TileSize" value="40 2"/>
                 <Property key="TileH" value="true"/>
                 <Property key="TileV" value="true"/>
             </State>
         </BasisSkin>
 
-        <BasisSkin type="TileRect" offset="0 2 2 36" align="ALIGN_LEFT ALIGN_VSTRETCH">
-            <State name="normal" offset="2 4 2 36">
-                <Property key="TileSize" value="2 36"/>
-                <Property key="TileH" value="true"/>
-                <Property key="TileV" value="true"/>
-            </State>
-        </BasisSkin>
-
-        <BasisSkin type="TileRect" offset="38 2 2 36" align="ALIGN_RIGHT ALIGN_VSTRETCH">
-            <State name="normal" offset="40 4 2 36">
-                <Property key="TileSize" value="2 36"/>
-                <Property key="TileH" value="true"/>
-                <Property key="TileV" value="true"/>
-            </State>
-        </BasisSkin>
-
         <!-- The interior of the box -->
         <Child type="Widget" skin="DialogBG" offset="2 2 36 36" align="ALIGN_STRETCH" name="Client"/>
     </Skin>
diff --git a/files/mygui/openmw_loading_screen.layout b/files/mygui/openmw_loading_screen.layout
index 6862702ca1..4b6861151a 100644
--- a/files/mygui/openmw_loading_screen.layout
+++ b/files/mygui/openmw_loading_screen.layout
@@ -6,12 +6,12 @@
 
         <Widget type="ImageBox" skin="ImageBox" position="0 0 300 300" align="Stretch" name="BackgroundImage">
 
-            <Widget type="Widget" skin="HUD_Box" position="0 200 300 70" align="Bottom HCenter">
+            <Widget type="Widget" skin="HUD_Box" position="0 200 300 60" align="Bottom HCenter">
 
                 <Widget type="AutoSizedTextBox" skin="SandText" position="20 12 260 24" name="LoadingText">
                 </Widget>
 
-                <Widget type="ProgressBar" skin="MW_Progress_Blue" position="20 38 260 24" name="ProgressBar">
+                <Widget type="ProgressBar" skin="MW_Progress_Loading" position="20 36 260 8" name="ProgressBar">
                     <Property key="Range" value="1000"/>
                 </Widget>
 
diff --git a/files/mygui/openmw_progress.skin.xml b/files/mygui/openmw_progress.skin.xml
index c4b94e28e2..4666be2217 100644
--- a/files/mygui/openmw_progress.skin.xml
+++ b/files/mygui/openmw_progress.skin.xml
@@ -17,6 +17,11 @@
             <State name="normal" offset = "0 28 2 14"/>
         </BasisSkin>
     </Skin>
+	<Skin name = "MW_BigTrack_Progress_Blue_Small" size = "2 6" texture = "smallbars.png" >
+        <BasisSkin type="MainSkin" offset = "0 0 2 6" align = "ALIGN_STRETCH">
+            <State name="normal" offset = "0 26 2 6"/>
+        </BasisSkin>
+    </Skin>
 
     <Skin name = "ProgressText" size = "16 16">
         <Property key="FontName" value = "Default"/>
@@ -51,4 +56,12 @@
         <Child type="Widget" skin="MW_Box" offset="0 0 64 12" align="ALIGN_STRETCH"/>
         <Child type="Widget" skin="BlackBG" offset = "2 2 60 8" align = "ALIGN_STRETCH" name="Client"/>
     </Skin>
+	
+	<Skin name="MW_Progress_Loading" size="64 6">
+        <Property key="TrackSkin" value = "MW_BigTrack_Progress_Blue_Small" />
+        <Property key="TrackWidth" value = "1" />
+
+        <Child type="Widget" skin="MW_Box" offset="0 0 64 6" align="ALIGN_STRETCH"/>
+        <Child type="Widget" skin="BlackBG" offset = "2 2 60 2" align = "ALIGN_STRETCH" name="Client"/>
+    </Skin>
 </MyGUI>
diff --git a/files/mygui/smallbars.png b/files/mygui/smallbars.png
index a9ed572ef6..f938412c25 100644
Binary files a/files/mygui/smallbars.png and b/files/mygui/smallbars.png differ