diff --git a/CUERipper/Resources/freedb16.png b/CUERipper/Resources/freedb16.png
new file mode 100644
index 0000000..a7ba138
Binary files /dev/null and b/CUERipper/Resources/freedb16.png differ
diff --git a/CUERipper/frmCUERipper.cs b/CUERipper/frmCUERipper.cs
index d4e46b1..4ac704e 100644
--- a/CUERipper/frmCUERipper.cs
+++ b/CUERipper/frmCUERipper.cs
@@ -1340,7 +1340,7 @@ namespace CUERipper
 			//catch
 			//{
 			//}
-			uint length = selectedDriveInfo.drive.TOC.Length / 75 - selectedDriveInfo.drive.TOC[1].Start / 75 + 2;
+			uint length = selectedDriveInfo.drive.TOC.Length / 75 + 2;
 			try
 			{
 				string res = m_freedb.Submit(entry, (int)length, AccurateRipVerify.CalculateCDDBId(selectedDriveInfo.drive.TOC), frm.Data.Category, false);
diff --git a/CUETools.AccurateRip/AccurateRip.cs b/CUETools.AccurateRip/AccurateRip.cs
index 321337a..71780bf 100644
--- a/CUETools.AccurateRip/AccurateRip.cs
+++ b/CUETools.AccurateRip/AccurateRip.cs
@@ -1443,7 +1443,7 @@ namespace CUETools.AccurateRip
 			query.AppendFormat("+{0}", toc.TrackCount);
 			for (int iTrack = 1; iTrack <= toc.TrackCount; iTrack++)
 				query.AppendFormat("+{0}", toc[iTrack].Start + 150);
-			query.AppendFormat("+{0}", toc.Length / 75 - toc[1].Start / 75);
+			query.AppendFormat("+{0}", toc.Length / 75 + 2);
 			return query.ToString();
 		}
 
diff --git a/CUETools/CUETools.csproj b/CUETools/CUETools.csproj
index adb37e7..51febb1 100644
--- a/CUETools/CUETools.csproj
+++ b/CUETools/CUETools.csproj
@@ -292,8 +292,8 @@
     <None Include="Resources\delete.png" />
     <None Include="Resources\cdrepair.ico" />
     <None Include="Resources\cdrepair.png" />
-    <None Include="Resources\more\icon\puzzle--arrow.png" />
-    <None Include="Resources\more\icon\alarm-clock--minus.png" />
+    <None Include="Resources\puzzle--arrow.png" />
+    <None Include="Resources\alarm-clock--minus.png" />
     <None Include="Resources\puzzle.ico" />
     <None Include="Resources\alarm-clock.ico" />
     <None Include="Resources\users.ico" />
diff --git a/CUETools/Resources/AR.png b/CUETools/Resources/AR.png
new file mode 100644
index 0000000..f8405ef
Binary files /dev/null and b/CUETools/Resources/AR.png differ
diff --git a/CUETools/Resources/alarm-clock--minus.png b/CUETools/Resources/alarm-clock--minus.png
new file mode 100644
index 0000000..013b66c
Binary files /dev/null and b/CUETools/Resources/alarm-clock--minus.png differ
diff --git a/CUETools/Resources/alarm-clock.png b/CUETools/Resources/alarm-clock.png
new file mode 100644
index 0000000..fb5453d
Binary files /dev/null and b/CUETools/Resources/alarm-clock.png differ
diff --git a/CUETools/Resources/cuetools.png b/CUETools/Resources/cuetools.png
new file mode 100644
index 0000000..0ef7b4c
Binary files /dev/null and b/CUETools/Resources/cuetools.png differ
diff --git a/CUETools/Resources/eac.png b/CUETools/Resources/eac.png
new file mode 100644
index 0000000..0cb8e83
Binary files /dev/null and b/CUETools/Resources/eac.png differ
diff --git a/CUETools/Resources/eac2.png b/CUETools/Resources/eac2.png
new file mode 100644
index 0000000..0119166
Binary files /dev/null and b/CUETools/Resources/eac2.png differ
diff --git a/CUETools/Resources/eac3.png b/CUETools/Resources/eac3.png
new file mode 100644
index 0000000..285efc3
Binary files /dev/null and b/CUETools/Resources/eac3.png differ
diff --git a/CUETools/Resources/musicbrainz.png b/CUETools/Resources/musicbrainz.png
new file mode 100644
index 0000000..6cef57d
Binary files /dev/null and b/CUETools/Resources/musicbrainz.png differ
diff --git a/CUETools/Resources/puzzle--arrow.png b/CUETools/Resources/puzzle--arrow.png
new file mode 100644
index 0000000..16d2ef5
Binary files /dev/null and b/CUETools/Resources/puzzle--arrow.png differ
diff --git a/CUETools/frmCUETools.cs b/CUETools/frmCUETools.cs
index e754d0e..d2fbd6d 100644
--- a/CUETools/frmCUETools.cs
+++ b/CUETools/frmCUETools.cs
@@ -925,7 +925,7 @@ namespace JDP {
 									true,
 									true,
 									checkBoxUseMusicBrainz.Checked ? CTDBPriority.High : CTDBPriority.None,
-									checkBoxUseFreeDb.Checked ? CTDBPriority.High : CTDBPriority.None,
+									checkBoxUseFreeDb.Checked ? CTDBPriority.Medium : CTDBPriority.None,
 									checkBoxUseFreeDb.Checked ? CTDBPriority.Low : CTDBPriority.None);
 								dlgRes = dlg.ShowDialog(this);
 								_choiceMaxed = dlg.WindowState == FormWindowState.Maximized;