diff --git a/BookmarkManager.csproj b/BookmarkManager.csproj
index b7b0818..297e230 100644
--- a/BookmarkManager.csproj
+++ b/BookmarkManager.csproj
@@ -12,10 +12,11 @@
     <Company>Hi, I'm Ray</Company>
     <Product>Bookmark Manager</Product>
     <Copyright>Ray Lam</Copyright>
-    <AssemblyVersion>0.4.4.026</AssemblyVersion>
-    <FileVersion>0.4.4.026</FileVersion>
-    <Version>0.4.4.026</Version>
+    <AssemblyVersion>1.0.0.0</AssemblyVersion>
+    <FileVersion>1.0.0.0</FileVersion>
+    <Version>0.5.0.011</Version>
     <PackageId>bookmarkmanager</PackageId>
+    <RunAnalyzersDuringLiveAnalysis>True</RunAnalyzersDuringLiveAnalysis>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
diff --git a/UpdateIconsForm.cs b/UpdateIconsForm.cs
index 27e5e45..7a354be 100644
--- a/UpdateIconsForm.cs
+++ b/UpdateIconsForm.cs
@@ -63,14 +63,14 @@ namespace FizzyLauncher
             this.label2 = new System.Windows.Forms.Label();
             this.toolTip1 = new System.Windows.Forms.ToolTip(this.components);
             this.pictureBox2 = new System.Windows.Forms.PictureBox();
-            this.pickerBox1 = new TYesNoPickerBox();
+            this.pickerBox1 = new RyzStudio.Windows.ThemedForms.PickerBox.TYesNoPickerBox();
             this.button2 = new RyzStudio.Windows.ThemedForms.TButton();
             this.progressBar1 = new RyzStudio.Windows.ThemedForms.TProgressBar();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit();
             this.SuspendLayout();
-            //
+            // 
             // label1
-            //
+            // 
             this.label1.AutoSize = true;
             this.label1.BackColor = System.Drawing.Color.Transparent;
             this.label1.ForeColor = System.Drawing.SystemColors.ControlText;
@@ -78,13 +78,13 @@ namespace FizzyLauncher
             this.label1.Margin = new System.Windows.Forms.Padding(0);
             this.label1.Name = "label1";
             this.label1.Padding = new System.Windows.Forms.Padding(0, 9, 0, 10);
-            this.label1.Size = new System.Drawing.Size(154, 34);
+            this.label1.Size = new System.Drawing.Size(133, 34);
             this.label1.TabIndex = 153;
-            this.label1.Text = "Find outstanding icons only";
+            this.label1.Text = "Find Missing Icons Only";
             this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
-            //
+            // 
             // button1
-            //
+            // 
             this.button1.AcceptButton = null;
             this.button1.ActiveImage = null;
             this.button1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
@@ -98,44 +98,43 @@ namespace FizzyLauncher
             this.button1.Padding = new System.Windows.Forms.Padding(4, 4, 3, 3);
             this.button1.Size = new System.Drawing.Size(128, 32);
             this.button1.TabIndex = 2;
+            this.button1.TabStop = false;
             this.button1.MouseClick += new System.Windows.Forms.MouseEventHandler(this.button1_MouseClick);
-            //
+            // 
             // tHorizontalSeparator1
-            //
-            this.tHorizontalSeparator1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)
+            // 
+            this.tHorizontalSeparator1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
             this.tHorizontalSeparator1.AutoScrollMargin = new System.Drawing.Size(0, 0);
             this.tHorizontalSeparator1.AutoScrollMinSize = new System.Drawing.Size(0, 0);
             this.tHorizontalSeparator1.BackColor = System.Drawing.Color.Transparent;
             this.tHorizontalSeparator1.Location = new System.Drawing.Point(10, 437);
-            this.tHorizontalSeparator1.Margin = new System.Windows.Forms.Padding(5, 0, 5, 10);
+            this.tHorizontalSeparator1.Margin = new System.Windows.Forms.Padding(0, 10, 0, 10);
             this.tHorizontalSeparator1.MaximumSize = new System.Drawing.Size(4920, 2);
             this.tHorizontalSeparator1.MinimumSize = new System.Drawing.Size(0, 22);
             this.tHorizontalSeparator1.Name = "tHorizontalSeparator1";
-            this.tHorizontalSeparator1.Padding = new System.Windows.Forms.Padding(0, 10, 0, 10);
             this.tHorizontalSeparator1.Size = new System.Drawing.Size(364, 22);
             this.tHorizontalSeparator1.TabIndex = 188;
             this.tHorizontalSeparator1.TabStop = false;
-            //
+            // 
             // tHorizontalSeparator2
-            //
-            this.tHorizontalSeparator2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+            // 
+            this.tHorizontalSeparator2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
             this.tHorizontalSeparator2.AutoScrollMargin = new System.Drawing.Size(0, 0);
             this.tHorizontalSeparator2.AutoScrollMinSize = new System.Drawing.Size(0, 0);
             this.tHorizontalSeparator2.BackColor = System.Drawing.Color.Transparent;
             this.tHorizontalSeparator2.Location = new System.Drawing.Point(10, 59);
-            this.tHorizontalSeparator2.Margin = new System.Windows.Forms.Padding(5, 0, 5, 10);
+            this.tHorizontalSeparator2.Margin = new System.Windows.Forms.Padding(0, 10, 0, 10);
             this.tHorizontalSeparator2.MaximumSize = new System.Drawing.Size(4920, 2);
             this.tHorizontalSeparator2.MinimumSize = new System.Drawing.Size(0, 22);
             this.tHorizontalSeparator2.Name = "tHorizontalSeparator2";
-            this.tHorizontalSeparator2.Padding = new System.Windows.Forms.Padding(0, 10, 0, 10);
             this.tHorizontalSeparator2.Size = new System.Drawing.Size(364, 22);
             this.tHorizontalSeparator2.TabIndex = 190;
             this.tHorizontalSeparator2.TabStop = false;
-            //
+            // 
             // label2
-            //
+            // 
             this.label2.AutoSize = true;
             this.label2.BackColor = System.Drawing.Color.Transparent;
             this.label2.ForeColor = System.Drawing.SystemColors.ControlText;
@@ -147,9 +146,9 @@ namespace FizzyLauncher
             this.label2.TabIndex = 195;
             this.label2.Text = "Progress";
             this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
-            //
+            // 
             // pictureBox2
-            //
+            // 
             this.pictureBox2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.pictureBox2.BackColor = System.Drawing.Color.Transparent;
             this.pictureBox2.ErrorImage = null;
@@ -160,23 +159,25 @@ namespace FizzyLauncher
             this.pictureBox2.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage;
             this.pictureBox2.TabIndex = 202;
             this.pictureBox2.TabStop = false;
-            //
+            // 
             // pickerBox1
-            //
+            // 
             this.pickerBox1.AcceptButton = null;
             this.pickerBox1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
             this.pickerBox1.BackColor = System.Drawing.Color.Transparent;
             this.pickerBox1.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point);
             this.pickerBox1.Location = new System.Drawing.Point(285, 21);
-            this.pickerBox1.Margin = new System.Windows.Forms.Padding(10, 4, 10, 4);
+            this.pickerBox1.Margin = new System.Windows.Forms.Padding(10, 10, 10, 0);
             this.pickerBox1.Name = "pickerBox1";
             this.pickerBox1.Padding = new System.Windows.Forms.Padding(4, 4, 3, 3);
+            this.pickerBox1.SelectedIndex = 1;
             this.pickerBox1.Size = new System.Drawing.Size(84, 35);
             this.pickerBox1.TabIndex = 0;
+            this.pickerBox1.TabStop = false;
             this.pickerBox1.Value = true;
-            //
+            // 
             // button2
-            //
+            // 
             this.button2.AcceptButton = null;
             this.button2.ActiveImage = null;
             this.button2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
@@ -190,12 +191,13 @@ namespace FizzyLauncher
             this.button2.Padding = new System.Windows.Forms.Padding(4, 4, 3, 3);
             this.button2.Size = new System.Drawing.Size(128, 32);
             this.button2.TabIndex = 1;
+            this.button2.TabStop = false;
             this.button2.MouseClick += new System.Windows.Forms.MouseEventHandler(this.button2_MouseClick);
-            //
+            // 
             // progressBar1
-            //
+            // 
             this.progressBar1.AcceptButton = null;
-            this.progressBar1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+            this.progressBar1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
             this.progressBar1.BackColor = System.Drawing.Color.Transparent;
             this.progressBar1.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point);
@@ -206,9 +208,9 @@ namespace FizzyLauncher
             this.progressBar1.Size = new System.Drawing.Size(359, 33);
             this.progressBar1.TabIndex = 206;
             this.progressBar1.TabStop = false;
-            //
+            // 
             // UpdateIconsForm
-            //
+            // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(384, 521);
diff --git a/installer-64.iss b/installer-64.iss
index f9b52c6..843ab8a 100644
--- a/installer-64.iss
+++ b/installer-64.iss
@@ -2,7 +2,7 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #define MyAppName "Bookmark Manager"
-#define MyAppVersion "0.4.4.026"
+#define MyAppVersion "0.5.0.011"
 #define MyAppPublisher "Hi, I'm Ray"
 #define MyAppURL "https://www.hiimray.co.uk/software-bookmark-manager"
 #define MyAppExeName "bookmarkmanager.exe"
@@ -35,8 +35,8 @@ Name: "english"; MessagesFile: "compiler:Default.isl"
 Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
 
 [Files]
-Source: "L:\gitlab-hiimray\bookmark-manager-r4\bin\Release\64\bookmarkmanager.exe"; DestDir: "{app}"; Flags: ignoreversion
-Source: "L:\gitlab-hiimray\bookmark-manager-r4\bin\Release\64\e_sqlite3.dll"; DestDir: "{app}"; Flags: ignoreversion
+Source: "L:\gitea-hiimray\bookmark-manager-r4\bin\Release\64\bookmarkmanager.exe"; DestDir: "{app}"; Flags: ignoreversion
+Source: "L:\gitea-hiimray\bookmark-manager-r4\bin\Release\64\e_sqlite3.dll"; DestDir: "{app}"; Flags: ignoreversion
 ; NOTE: Don't use "Flags: ignoreversion" on any shared system files
 
 [Icons]