diff --git a/CUETools.eac3ui/App.config b/CUETools.eac3ui/App.config
index a5d6c59..2e6226f 100644
--- a/CUETools.eac3ui/App.config
+++ b/CUETools.eac3ui/App.config
@@ -1,21 +1,26 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <configuration>
-    <configSections>
-        <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
-            <section name="BluTools.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
-        </sectionGroup>
-    </configSections>
-    <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
-    </startup>
-    <userSettings>
-        <BluTools.Properties.Settings>
-            <setting name="SourceFolder" serializeAs="String">
-                <value />
-            </setting>
-            <setting name="DestinationFolder" serializeAs="String">
-                <value />
-            </setting>
-        </BluTools.Properties.Settings>
-    </userSettings>
+  <configSections>
+    <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
+      <section name="BluTools.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
+    </sectionGroup>
+  </configSections>
+  <startup>
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
+  </startup>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <probing privatePath="plugins"/>
+    </assemblyBinding>
+  </runtime>
+  <userSettings>
+    <BluTools.Properties.Settings>
+      <setting name="SourceFolder" serializeAs="String">
+        <value />
+      </setting>
+      <setting name="DestinationFolder" serializeAs="String">
+        <value />
+      </setting>
+    </BluTools.Properties.Settings>
+  </userSettings>
 </configuration>
\ No newline at end of file
diff --git a/CUETools.eac3ui/BLUTools.csproj b/CUETools.eac3ui/BLUTools.csproj
index 09fd988..5c9bb4f 100644
--- a/CUETools.eac3ui/BLUTools.csproj
+++ b/CUETools.eac3ui/BLUTools.csproj
@@ -19,7 +19,7 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
+    <OutputPath>..\bin\Debug\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -28,11 +28,14 @@
     <PlatformTarget>AnyCPU</PlatformTarget>
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
+    <OutputPath>..\bin\Release\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
+  <PropertyGroup>
+    <ApplicationIcon>Icons\cue2.ico</ApplicationIcon>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Data" />
@@ -104,10 +107,12 @@
     <ProjectReference Include="..\CUETools.Codecs.BDLPCM\CUETools.Codecs.BDLPCM.csproj">
       <Project>{e75f7ccd-4266-42e1-a039-dc7eb5edd8f6}</Project>
       <Name>CUETools.Codecs.BDLPCM</Name>
+      <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\CUETools.Codecs.FLAKE\CUETools.Codecs.FLAKE.csproj">
       <Project>{082d6b9e-326e-4d15-9798-edae9ede70a6}</Project>
       <Name>CUETools.Codecs.FLAKE</Name>
+      <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\CUETools.Codecs\CUETools.Codecs.csproj">
       <Project>{6458a13a-30ef-45a9-9d58-e5031b17bee2}</Project>
@@ -125,9 +130,6 @@
   <ItemGroup>
     <Resource Include="Icons\freedb16.png" />
   </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Icons\musicbrainz.ico" />
-  </ItemGroup>
   <ItemGroup>
     <Resource Include="Icons\discogs.png" />
   </ItemGroup>
@@ -173,5 +175,14 @@
   <ItemGroup>
     <Resource Include="Icons\cue2.ico" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Icons\discogs-32x32.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Icons\musicbrainz-16x16.ico" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Icons\musicbrainz-picard.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file
diff --git a/CUETools.eac3ui/Icons/discogs-32x32.png b/CUETools.eac3ui/Icons/discogs-32x32.png
new file mode 100644
index 0000000..0838b01
Binary files /dev/null and b/CUETools.eac3ui/Icons/discogs-32x32.png differ
diff --git a/CUETools.eac3ui/Icons/musicbrainz-16x16.ico b/CUETools.eac3ui/Icons/musicbrainz-16x16.ico
new file mode 100644
index 0000000..7f951da
Binary files /dev/null and b/CUETools.eac3ui/Icons/musicbrainz-16x16.ico differ
diff --git a/CUETools.eac3ui/Icons/musicbrainz-picard.png b/CUETools.eac3ui/Icons/musicbrainz-picard.png
new file mode 100644
index 0000000..26c4981
Binary files /dev/null and b/CUETools.eac3ui/Icons/musicbrainz-picard.png differ
diff --git a/CUETools.eac3ui/Icons/musicbrainz.ico b/CUETools.eac3ui/Icons/musicbrainz.ico
deleted file mode 100644
index 7942139..0000000
Binary files a/CUETools.eac3ui/Icons/musicbrainz.ico and /dev/null differ
diff --git a/CUETools.eac3ui/MainWindow.xaml b/CUETools.eac3ui/MainWindow.xaml
index 1324dc6..c642ce8 100644
--- a/CUETools.eac3ui/MainWindow.xaml
+++ b/CUETools.eac3ui/MainWindow.xaml
@@ -5,7 +5,7 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:BluTools"
         mc:Ignorable="d"
-        MinWidth="300" MaxWidth="1200" MinHeight="260" MaxHeight="300"
+        MinWidth="300" MaxWidth="1200" MinHeight="260" MaxHeight="260"
         DataContext="{Binding RelativeSource={RelativeSource Self}}"
         Icon="Icons/cue2.ico"
         Title="BluTools" Height="260" Width="600" Closing="Window_Closing" Initialized="Window_Initialized">
@@ -37,8 +37,8 @@
         <Image x:Key="format_type_6" Source="/BluTools;component/Icons/ic_surround_sound_black_48dp_1x.png"></Image>
 
         <Image x:Key="freedb" Source="/BluTools;component/Icons/freedb16.png"></Image>
-        <Image x:Key="musicbrainz" Source="/BluTools;component/Icons/musicbrainz.ico"></Image>
-        <Image x:Key="discogs" Source="/BluTools;component/Icons/discogs.png"></Image>
+        <Image x:Key="musicbrainz" Source="/BluTools;component/Icons/musicbrainz-picard.png"></Image>
+        <Image x:Key="discogs" Source="/BluTools;component/Icons/discogs-32x32.png"></Image>
     </Window.Resources>
     <StackPanel>
         <StackPanel x:Name="stackParams">
@@ -92,7 +92,7 @@
                     <ComboBox.ItemTemplate>
                         <DataTemplate>
                             <StackPanel Orientation="Horizontal">
-                                <Image Source="{Binding ImageKey, Converter={StaticResource MetadataSourceToIcon}}" Width="Auto" Margin="1,1,5,1" MinWidth="16" MinHeight="16"></Image>
+                                <Image Source="{Binding ImageKey, Converter={StaticResource MetadataSourceToIcon}}" Margin="1,1,5,1" Width="16" Height="16"></Image>
                                 <!--<TextBlock Text="{Binding metadata.Artist}" Margin="10,0" />
                                 <TextBlock Text="{Binding metadata.Year}" Margin="10,0" />
                                 <TextBlock Text="{Binding metadata.Title}" Margin="10,0" />-->