diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 919b8e5..fdc74b4 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,3 +1,7 @@
+v0.4.1 (2013-08-07)
+-------------------
+* Fix Help links
+
 v0.4.0 (2013-08-07)
 -------------------
 * Runs on Linux and Mac (client mode only)
diff --git a/KeeAgent/Properties/AssemblyInfo.cs b/KeeAgent/Properties/AssemblyInfo.cs
index 04446cd..5e4e98b 100644
--- a/KeeAgent/Properties/AssemblyInfo.cs
+++ b/KeeAgent/Properties/AssemblyInfo.cs
@@ -50,5 +50,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion ("0.4.0.0")]
-[assembly: AssemblyFileVersion ("0.4.0.0")]
+[assembly: AssemblyVersion ("0.4.1.0")]
+[assembly: AssemblyFileVersion ("0.4.1.0")]
diff --git a/KeeAgent/Properties/Resources.Designer.cs b/KeeAgent/Properties/Resources.Designer.cs
index 99de4a8..16407de 100644
--- a/KeeAgent/Properties/Resources.Designer.cs
+++ b/KeeAgent/Properties/Resources.Designer.cs
@@ -89,7 +89,7 @@ internal static System.Drawing.Bitmap KeeAgentIcon_png {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to http://lechnology.com/KeeAgent+Manager&amp;structure=KeeAgent#AddFromFile.
+        ///   Looks up a localized string similar to http://lechnology.com/KeeAgent+Manager#AddFromFile.
         /// </summary>
         internal static string WebHelpAddFromFile {
             get {
@@ -98,7 +98,7 @@ internal static string WebHelpAddFromFile {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to http://lechnology.com/KeeAgent+Options+and+Settings&amp;structure=KeeAgent#Database_Settings.
+        ///   Looks up a localized string similar to http://lechnology.com/KeeAgent+Options+and+Settings#Database_Settings.
         /// </summary>
         internal static string WebHelpDatabaseSettings {
             get {
@@ -107,7 +107,7 @@ internal static string WebHelpDatabaseSettings {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to http://lechnology.com/KeeAgent+Options+and+Settings&amp;structure=KeeAgent#Entry_Settings.
+        ///   Looks up a localized string similar to http://lechnology.com/KeeAgent+Options+and+Settings#Entry_Settings.
         /// </summary>
         internal static string WebHelpEntryOptions {
             get {
@@ -116,7 +116,7 @@ internal static string WebHelpEntryOptions {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to http://lechnology.com/KeeAgent+Manager&amp;structure=KeeAgent#EntryPicker.
+        ///   Looks up a localized string similar to http://lechnology.com/KeeAgent+Manager#EntryPicker.
         /// </summary>
         internal static string WebHelpEntryPicker {
             get {
@@ -125,7 +125,7 @@ internal static string WebHelpEntryPicker {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to http://lechnology.com/KeeAgent+Options+and+Settings&amp;structure=KeeAgent#Global_Options.
+        ///   Looks up a localized string similar to http://lechnology.com/KeeAgent+Options+and+Settings#Global_Options.
         /// </summary>
         internal static string WebHelpGlobalOptions {
             get {
@@ -143,7 +143,7 @@ internal static string WebHelpHome {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to http://lechnology.com/KeeAgent+Manager&amp;structure=KeeAgent.
+        ///   Looks up a localized string similar to http://lechnology.com/KeeAgent+Manager.
         /// </summary>
         internal static string WebHelpKeeAgentManager {
             get {
diff --git a/KeeAgent/Properties/Resources.resx b/KeeAgent/Properties/Resources.resx
index 9221df3..6cd52ad 100644
--- a/KeeAgent/Properties/Resources.resx
+++ b/KeeAgent/Properties/Resources.resx
@@ -131,24 +131,24 @@
     <value>..\Resources\KeeAgent-icon-mono.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="WebHelpAddFromFile" xml:space="preserve">
-    <value>http://lechnology.com/KeeAgent+Manager&amp;structure=KeeAgent#AddFromFile</value>
+    <value>http://lechnology.com/KeeAgent+Manager#AddFromFile</value>
   </data>
   <data name="WebHelpDatabaseSettings" xml:space="preserve">
-    <value>http://lechnology.com/KeeAgent+Options+and+Settings&amp;structure=KeeAgent#Database_Settings</value>
+    <value>http://lechnology.com/KeeAgent+Options+and+Settings#Database_Settings</value>
   </data>
   <data name="WebHelpEntryOptions" xml:space="preserve">
-    <value>http://lechnology.com/KeeAgent+Options+and+Settings&amp;structure=KeeAgent#Entry_Settings</value>
+    <value>http://lechnology.com/KeeAgent+Options+and+Settings#Entry_Settings</value>
   </data>
   <data name="WebHelpEntryPicker" xml:space="preserve">
-    <value>http://lechnology.com/KeeAgent+Manager&amp;structure=KeeAgent#EntryPicker</value>
+    <value>http://lechnology.com/KeeAgent+Manager#EntryPicker</value>
   </data>
   <data name="WebHelpGlobalOptions" xml:space="preserve">
-    <value>http://lechnology.com/KeeAgent+Options+and+Settings&amp;structure=KeeAgent#Global_Options</value>
+    <value>http://lechnology.com/KeeAgent+Options+and+Settings#Global_Options</value>
   </data>
   <data name="WebHelpHome" xml:space="preserve">
     <value>http://lechnology.com/KeeAgent</value>
   </data>
   <data name="WebHelpKeeAgentManager" xml:space="preserve">
-    <value>http://lechnology.com/KeeAgent+Manager&amp;structure=KeeAgent</value>
+    <value>http://lechnology.com/KeeAgent+Manager</value>
   </data>
 </root>
\ No newline at end of file
diff --git a/KeeAgent/UI/EntryPickerDialog.cs b/KeeAgent/UI/EntryPickerDialog.cs
index c21d6a3..a5dd3bb 100644
--- a/KeeAgent/UI/EntryPickerDialog.cs
+++ b/KeeAgent/UI/EntryPickerDialog.cs
@@ -276,7 +276,7 @@ private void UpdateImageLists()
       }
       imgList.Images.AddRange(lStdImages.ToArray());
 
-      Debug.Assert(imgList.Images.Count == (int)PwIcon.Count);
+      Debug.Assert(imgList.Images.Count >= (int)PwIcon.Count);
 
       List<Image> lCustom = UIUtil.BuildImageListEx(
        mActiveDb.CustomIcons, 16, 16);