diff --git a/src/Forms/Main.cs b/src/Forms/Main.cs
index 92dbe3cbb..5855f4b6a 100644
--- a/src/Forms/Main.cs
+++ b/src/Forms/Main.cs
@@ -87,7 +87,7 @@ namespace Nikse.SubtitleEdit.Forms
                     if (versionInfo.Length >= 3 && versionInfo[2] != "0")
                         _title += "." + versionInfo[2];
 
-                    _title = "Subtitle Edit 3.0 RC1";
+                    _title = "Subtitle Edit 3.0 RC2";
 
                 }
                 return _title;
@@ -176,6 +176,7 @@ namespace Nikse.SubtitleEdit.Forms
             panelWaveFormControls.Visible = Configuration.Settings.General.ShowWaveForm;
             trackBarWaveFormPosition.Visible = Configuration.Settings.General.ShowWaveForm;
             toolStripButtonToogleWaveForm.Checked = Configuration.Settings.General.ShowWaveForm;
+            toolStripButtonToogleVideo.Checked = Configuration.Settings.General.ShowVideoPlayer;
 
             string fileName = string.Empty;
             string[] args = Environment.GetCommandLineArgs();
diff --git a/src/Icons/SE.ico b/src/Icons/SE.ico
new file mode 100644
index 000000000..9acdc480b
Binary files /dev/null and b/src/Icons/SE.ico differ
diff --git a/src/Properties/AssemblyInfo.cs b/src/Properties/AssemblyInfo.cs
index f53f00e11..2657c85b8 100644
--- a/src/Properties/AssemblyInfo.cs
+++ b/src/Properties/AssemblyInfo.cs
@@ -6,11 +6,11 @@ using System.Runtime.InteropServices;
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("SubtitleEdit")]
-[assembly: AssemblyDescription("")]
+[assembly: AssemblyDescription("Subtitle Edit")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
+[assembly: AssemblyCompany("Nikse")]
 [assembly: AssemblyProduct("SubtitleEdit")]
-[assembly: AssemblyCopyright("")]
+[assembly: AssemblyCopyright("Nikse")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -31,4 +31,4 @@ using System.Runtime.InteropServices;
 //
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
-//[assembly: AssemblyVersion("3.0.0.*")]
+[assembly: AssemblyVersion("3.0.0.*")]
diff --git a/src/SubtitleEdit.csproj b/src/SubtitleEdit.csproj
index 2a91977bf..15792b935 100644
--- a/src/SubtitleEdit.csproj
+++ b/src/SubtitleEdit.csproj
@@ -13,7 +13,7 @@
     <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <IsWebBootstrapper>false</IsWebBootstrapper>
-    <ApplicationIcon>SE.ico</ApplicationIcon>
+    <ApplicationIcon>Icons\SE.ico</ApplicationIcon>
     <ManifestCertificateThumbprint>DCCE7922B5E425ADB221E06DC2FB405664CF8F63</ManifestCertificateThumbprint>
     <ManifestKeyFile>SubtitleEdit_TemporaryKey.pfx</ManifestKeyFile>
     <GenerateManifests>true</GenerateManifests>
@@ -794,7 +794,7 @@
     <Content Include="Resources\sv-SE.xml">
       <SubType>Designer</SubType>
     </Content>
-    <Content Include="SE.ico" />
+    <Content Include="Icons\SE.ico" />
   </ItemGroup>
   <ItemGroup>
     <BootstrapperPackage Include="Microsoft.Net.Client.3.5">