diff --git a/CHANGELOG.md b/CHANGELOG.md
index bc9a6a90a..086a82ed9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,8 @@ Changes in 7.2.0:
     - "Apple Driver" on Mac and "Sane Driver" on Linux should also work
   - NAPS2 currently must be kept open on the host for sharing to work
   - Shared scanners can be used from any ESCL-capable client, not just NAPS2
+- Slightly updated icons in Profiles window 
+- Bug fixes
 
 Changes in 7.1.2:
 - Mac: Fixed scanning with macOS 14 Sonoma 
diff --git a/NAPS2.Lib/EtoForms/Widgets/ProfileListViewBehavior.cs b/NAPS2.Lib/EtoForms/Widgets/ProfileListViewBehavior.cs
index b19848c7c..f52e02801 100644
--- a/NAPS2.Lib/EtoForms/Widgets/ProfileListViewBehavior.cs
+++ b/NAPS2.Lib/EtoForms/Widgets/ProfileListViewBehavior.cs
@@ -35,7 +35,7 @@ public class ProfileListViewBehavior : ListViewBehavior<ScanProfile>
         {
             return Icons.scanner_lock.ToEtoImage();
         }
-        return Icons.scanner_48_old.ToEtoImage();
+        return Icons.scanner_48.ToEtoImage();
     }
 
     public override bool AllowDragDrop => true;
diff --git a/NAPS2.Lib/EtoForms/Widgets/SharedDevicesListViewBehavior.cs b/NAPS2.Lib/EtoForms/Widgets/SharedDevicesListViewBehavior.cs
index c47193d79..65b369816 100644
--- a/NAPS2.Lib/EtoForms/Widgets/SharedDevicesListViewBehavior.cs
+++ b/NAPS2.Lib/EtoForms/Widgets/SharedDevicesListViewBehavior.cs
@@ -14,5 +14,5 @@ public class SharedDevicesListViewBehavior : ListViewBehavior<SharedDevice>
 
     public override string GetLabel(SharedDevice item) => item.Name;
 
-    public override Image GetImage(SharedDevice item, int imageSize) => Icons.scanner_48_old.ToEtoImage();
+    public override Image GetImage(SharedDevice item, int imageSize) => Icons.scanner_wireless.ToEtoImage();
 }
\ No newline at end of file
diff --git a/NAPS2.Lib/Icons.Designer.cs b/NAPS2.Lib/Icons.Designer.cs
index 6916d62e4..ca123ab97 100644
--- a/NAPS2.Lib/Icons.Designer.cs
+++ b/NAPS2.Lib/Icons.Designer.cs
@@ -11,32 +11,46 @@ namespace NAPS2 {
     using System;
     
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
-    [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-    [System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    /// <summary>
+    ///   A strongly-typed resource class, for looking up localized strings, etc.
+    /// </summary>
+    // This class was auto-generated by the StronglyTypedResourceBuilder
+    // class via a tool like ResGen or Visual Studio.
+    // To add or remove a member, edit your .ResX file then rerun ResGen
+    // with the /str option, or rebuild your VS project.
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     internal class Icons {
         
-        private static System.Resources.ResourceManager resourceMan;
+        private static global::System.Resources.ResourceManager resourceMan;
         
-        private static System.Globalization.CultureInfo resourceCulture;
+        private static global::System.Globalization.CultureInfo resourceCulture;
         
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
         internal Icons() {
         }
         
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static System.Resources.ResourceManager ResourceManager {
+        /// <summary>
+        ///   Returns the cached ResourceManager instance used by this class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Resources.ResourceManager ResourceManager {
             get {
-                if (object.Equals(null, resourceMan)) {
-                    System.Resources.ResourceManager temp = new System.Resources.ResourceManager("NAPS2.Icons", typeof(Icons).Assembly);
+                if (object.ReferenceEquals(resourceMan, null)) {
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("NAPS2.Icons", typeof(Icons).Assembly);
                     resourceMan = temp;
                 }
                 return resourceMan;
             }
         }
         
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static System.Globalization.CultureInfo Culture {
+        /// <summary>
+        ///   Overrides the current thread's CurrentUICulture property for all
+        ///   resource lookups using this strongly typed resource class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Globalization.CultureInfo Culture {
             get {
                 return resourceCulture;
             }
@@ -45,216 +59,9 @@ namespace NAPS2 {
             }
         }
         
-        internal static byte[] arrow_down {
-            get {
-                object obj = ResourceManager.GetObject("arrow_down", resourceCulture);
-                return ((byte[])(obj));
-            }
-        }
-        
-        internal static byte[] arrow_out {
-            get {
-                object obj = ResourceManager.GetObject("arrow_out", resourceCulture);
-                return ((byte[])(obj));
-            }
-        }
-        
-        internal static byte[] arrow_rotate_anticlockwise {
-            get {
-                object obj = ResourceManager.GetObject("arrow_rotate_anticlockwise", resourceCulture);
-                return ((byte[])(obj));
-            }
-        }
-        
-        internal static byte[] arrow_rotate_clockwise {
-            get {
-                object obj = ResourceManager.GetObject("arrow_rotate_clockwise", resourceCulture);
-                return ((byte[])(obj));
-            }
-        }
-        
-        internal static byte[] arrow_switch {
-            get {
-                object obj = ResourceManager.GetObject("arrow_switch", resourceCulture);
-                return ((byte[])(obj));
-            }
-        }
-        
-        internal static byte[] arrow_up {
-            get {
-                object obj = ResourceManager.GetObject("arrow_up", resourceCulture);
-                return ((byte[])(obj));
-            }
-        }
-        
-        internal static byte[] blueprints {
-            get {
-                object obj = ResourceManager.GetObject("blueprints", resourceCulture);
-                return ((byte[])(obj));
-            }
-        }
-        
-        internal static byte[] cross {
-            get {
-                object obj = ResourceManager.GetObject("cross", resourceCulture);
-                return ((byte[])(obj));
-            }
-        }
-        
-        internal static byte[] key_small {
-            get {
-                object obj = ResourceManager.GetObject("key_small", resourceCulture);
-                return ((byte[])(obj));
-            }
-        }
-        
-        internal static byte[] email_small {
-            get {
-                object obj = ResourceManager.GetObject("email_small", resourceCulture);
-                return ((byte[])(obj));
-            }
-        }
-        
-        internal static byte[] email_attach {
-            get {
-                object obj = ResourceManager.GetObject("email_attach", resourceCulture);
-                return ((byte[])(obj));
-            }
-        }
-        
-        internal static byte[] file_extension_pdf {
-            get {
-                object obj = ResourceManager.GetObject("file_extension_pdf", resourceCulture);
-                return ((byte[])(obj));
-            }
-        }
-        
-        internal static byte[] file_extension_pdf_small {
-            get {
-                object obj = ResourceManager.GetObject("file_extension_pdf_small", resourceCulture);
-                return ((byte[])(obj));
-            }
-        }
-        
-        internal static byte[] information {
-            get {
-                object obj = ResourceManager.GetObject("information", resourceCulture);
-                return ((byte[])(obj));
-            }
-        }
-        
-        internal static byte[] info_rhombus {
-            get {
-                object obj = ResourceManager.GetObject("info_rhombus", resourceCulture);
-                return ((byte[])(obj));
-            }
-        }
-        
-        internal static byte[] pdf_email {
-            get {
-                object obj = ResourceManager.GetObject("pdf_email", resourceCulture);
-                return ((byte[])(obj));
-            }
-        }
-        
-        internal static byte[] picture {
-            get {
-                object obj = ResourceManager.GetObject("picture", resourceCulture);
-                return ((byte[])(obj));
-            }
-        }
-        
-        internal static byte[] scanner_16 {
-            get {
-                object obj = ResourceManager.GetObject("scanner_16", resourceCulture);
-                return ((byte[])(obj));
-            }
-        }
-        
-        internal static byte[] scanner_32 {
-            get {
-                object obj = ResourceManager.GetObject("scanner_32", resourceCulture);
-                return ((byte[])(obj));
-            }
-        }
-        
-        internal static byte[] scanner_48_old {
-            get {
-                object obj = ResourceManager.GetObject("scanner_48_old", resourceCulture);
-                return ((byte[])(obj));
-            }
-        }
-        
-        internal static byte[] scanner_48 {
-            get {
-                object obj = ResourceManager.GetObject("scanner_48", resourceCulture);
-                return ((byte[])(obj));
-            }
-        }
-        
-        internal static byte[] scanner_64 {
-            get {
-                object obj = ResourceManager.GetObject("scanner_64", resourceCulture);
-                return ((byte[])(obj));
-            }
-        }
-        
-        internal static byte[] scanner_128 {
-            get {
-                object obj = ResourceManager.GetObject("scanner_128", resourceCulture);
-                return ((byte[])(obj));
-            }
-        }
-        
-        internal static byte[] scanner_default {
-            get {
-                object obj = ResourceManager.GetObject("scanner_default", resourceCulture);
-                return ((byte[])(obj));
-            }
-        }
-        
-        internal static byte[] scanner_lock_default {
-            get {
-                object obj = ResourceManager.GetObject("scanner_lock_default", resourceCulture);
-                return ((byte[])(obj));
-            }
-        }
-        
-        internal static byte[] scanner_lock {
-            get {
-                object obj = ResourceManager.GetObject("scanner_lock", resourceCulture);
-                return ((byte[])(obj));
-            }
-        }
-        
-        internal static byte[] transform_flip {
-            get {
-                object obj = ResourceManager.GetObject("transform_flip", resourceCulture);
-                return ((byte[])(obj));
-            }
-        }
-        
-        internal static byte[] zoom_actual {
-            get {
-                object obj = ResourceManager.GetObject("zoom_actual", resourceCulture);
-                return ((byte[])(obj));
-            }
-        }
-        
-        internal static byte[] zoom_in {
-            get {
-                object obj = ResourceManager.GetObject("zoom_in", resourceCulture);
-                return ((byte[])(obj));
-            }
-        }
-        
-        internal static byte[] zoom_out {
-            get {
-                object obj = ResourceManager.GetObject("zoom_out", resourceCulture);
-                return ((byte[])(obj));
-            }
-        }
-        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Byte[].
+        /// </summary>
         internal static byte[] accept {
             get {
                 object obj = ResourceManager.GetObject("accept", resourceCulture);
@@ -262,6 +69,9 @@ namespace NAPS2 {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized resource of type System.Byte[].
+        /// </summary>
         internal static byte[] accept_small {
             get {
                 object obj = ResourceManager.GetObject("accept_small", resourceCulture);
@@ -269,6 +79,9 @@ namespace NAPS2 {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized resource of type System.Byte[].
+        /// </summary>
         internal static byte[] add {
             get {
                 object obj = ResourceManager.GetObject("add", resourceCulture);
@@ -276,6 +89,9 @@ namespace NAPS2 {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized resource of type System.Byte[].
+        /// </summary>
         internal static byte[] add_small {
             get {
                 object obj = ResourceManager.GetObject("add_small", resourceCulture);
@@ -283,307 +99,9 @@ namespace NAPS2 {
             }
         }
         
-        internal static byte[] cancel {
-            get {
-                object obj = ResourceManager.GetObject("cancel", resourceCulture);
-                return ((byte[])(obj));
-            }
-        }
-        
-        internal static byte[] cancel_small {
-            get {
-                object obj = ResourceManager.GetObject("cancel_small", resourceCulture);
-                return ((byte[])(obj));
-            }
-        }
-        
-        internal static byte[] cross_small {
-            get {
-                object obj = ResourceManager.GetObject("cross_small", resourceCulture);
-                return ((byte[])(obj));
-            }
-        }
-        
-        internal static byte[] pencil {
-            get {
-                object obj = ResourceManager.GetObject("pencil", resourceCulture);
-                return ((byte[])(obj));
-            }
-        }
-        
-        internal static byte[] pencil_small {
-            get {
-                object obj = ResourceManager.GetObject("pencil_small", resourceCulture);
-                return ((byte[])(obj));
-            }
-        }
-        
-        internal static byte[] tick {
-            get {
-                object obj = ResourceManager.GetObject("tick", resourceCulture);
-                return ((byte[])(obj));
-            }
-        }
-        
-        internal static byte[] tick_small {
-            get {
-                object obj = ResourceManager.GetObject("tick_small", resourceCulture);
-                return ((byte[])(obj));
-            }
-        }
-        
-        internal static byte[] blueprints_small {
-            get {
-                object obj = ResourceManager.GetObject("blueprints_small", resourceCulture);
-                return ((byte[])(obj));
-            }
-        }
-        
-        internal static byte[] world {
-            get {
-                object obj = ResourceManager.GetObject("world", resourceCulture);
-                return ((byte[])(obj));
-            }
-        }
-        
-        internal static byte[] folder_picture {
-            get {
-                object obj = ResourceManager.GetObject("folder_picture", resourceCulture);
-                return ((byte[])(obj));
-            }
-        }
-        
-        internal static byte[] arrow_refresh {
-            get {
-                object obj = ResourceManager.GetObject("arrow_refresh", resourceCulture);
-                return ((byte[])(obj));
-            }
-        }
-        
-        internal static byte[] arrow_rotate_anticlockwise_small {
-            get {
-                object obj = ResourceManager.GetObject("arrow_rotate_anticlockwise_small", resourceCulture);
-                return ((byte[])(obj));
-            }
-        }
-        
-        internal static byte[] arrow_rotate_clockwise_small {
-            get {
-                object obj = ResourceManager.GetObject("arrow_rotate_clockwise_small", resourceCulture);
-                return ((byte[])(obj));
-            }
-        }
-        
-        internal static byte[] arrow_switch_small {
-            get {
-                object obj = ResourceManager.GetObject("arrow_switch_small", resourceCulture);
-                return ((byte[])(obj));
-            }
-        }
-        
-        internal static byte[] text {
-            get {
-                object obj = ResourceManager.GetObject("text", resourceCulture);
-                return ((byte[])(obj));
-            }
-        }
-        
-        internal static byte[] text_small {
-            get {
-                object obj = ResourceManager.GetObject("text_small", resourceCulture);
-                return ((byte[])(obj));
-            }
-        }
-        
-        internal static byte[] control_play_blue {
-            get {
-                object obj = ResourceManager.GetObject("control_play_blue", resourceCulture);
-                return ((byte[])(obj));
-            }
-        }
-        
-        internal static byte[] control_play_blue_small {
-            get {
-                object obj = ResourceManager.GetObject("control_play_blue_small", resourceCulture);
-                return ((byte[])(obj));
-            }
-        }
-        
-        internal static byte[] color_wheel {
-            get {
-                object obj = ResourceManager.GetObject("color_wheel", resourceCulture);
-                return ((byte[])(obj));
-            }
-        }
-        
-        internal static byte[] contrast {
-            get {
-                object obj = ResourceManager.GetObject("contrast", resourceCulture);
-                return ((byte[])(obj));
-            }
-        }
-        
-        internal static byte[] image_edit {
-            get {
-                object obj = ResourceManager.GetObject("image_edit", resourceCulture);
-                return ((byte[])(obj));
-            }
-        }
-        
-        internal static byte[] transform_crop {
-            get {
-                object obj = ResourceManager.GetObject("transform_crop", resourceCulture);
-                return ((byte[])(obj));
-            }
-        }
-        
-        internal static byte[] weather_sun {
-            get {
-                object obj = ResourceManager.GetObject("weather_sun", resourceCulture);
-                return ((byte[])(obj));
-            }
-        }
-        
-        internal static byte[] arrow_down_small {
-            get {
-                object obj = ResourceManager.GetObject("arrow_down_small", resourceCulture);
-                return ((byte[])(obj));
-            }
-        }
-        
-        internal static byte[] arrow_up_small {
-            get {
-                object obj = ResourceManager.GetObject("arrow_up_small", resourceCulture);
-                return ((byte[])(obj));
-            }
-        }
-        
-        internal static byte[] pictures {
-            get {
-                object obj = ResourceManager.GetObject("pictures", resourceCulture);
-                return ((byte[])(obj));
-            }
-        }
-        
-        internal static byte[] picture_edit {
-            get {
-                object obj = ResourceManager.GetObject("picture_edit", resourceCulture);
-                return ((byte[])(obj));
-            }
-        }
-        
-        internal static byte[] picture_save {
-            get {
-                object obj = ResourceManager.GetObject("picture_save", resourceCulture);
-                return ((byte[])(obj));
-            }
-        }
-        
-        internal static byte[] arrow_left {
-            get {
-                object obj = ResourceManager.GetObject("arrow_left", resourceCulture);
-                return ((byte[])(obj));
-            }
-        }
-        
-        internal static byte[] arrow_right {
-            get {
-                object obj = ResourceManager.GetObject("arrow_right", resourceCulture);
-                return ((byte[])(obj));
-            }
-        }
-        
-        internal static byte[] printer {
-            get {
-                object obj = ResourceManager.GetObject("printer", resourceCulture);
-                return ((byte[])(obj));
-            }
-        }
-        
-        internal static byte[] application_cascade {
-            get {
-                object obj = ResourceManager.GetObject("application_cascade", resourceCulture);
-                return ((byte[])(obj));
-            }
-        }
-        
-        internal static byte[] close {
-            get {
-                object obj = ResourceManager.GetObject("close", resourceCulture);
-                return ((byte[])(obj));
-            }
-        }
-        
-        internal static byte[] picture_small {
-            get {
-                object obj = ResourceManager.GetObject("picture_small", resourceCulture);
-                return ((byte[])(obj));
-            }
-        }
-        
-        internal static byte[] color_gradient {
-            get {
-                object obj = ResourceManager.GetObject("color_gradient", resourceCulture);
-                return ((byte[])(obj));
-            }
-        }
-        
-        internal static byte[] color_management {
-            get {
-                object obj = ResourceManager.GetObject("color_management", resourceCulture);
-                return ((byte[])(obj));
-            }
-        }
-        
-        internal static byte[] contrast_high {
-            get {
-                object obj = ResourceManager.GetObject("contrast_high", resourceCulture);
-                return ((byte[])(obj));
-            }
-        }
-        
-        internal static byte[] contrast_with_sun {
-            get {
-                object obj = ResourceManager.GetObject("contrast_with_sun", resourceCulture);
-                return ((byte[])(obj));
-            }
-        }
-        
-        internal static byte[] sharpen {
-            get {
-                object obj = ResourceManager.GetObject("sharpen", resourceCulture);
-                return ((byte[])(obj));
-            }
-        }
-        
-        internal static byte[] btn_donate_LG {
-            get {
-                object obj = ResourceManager.GetObject("btn_donate_LG", resourceCulture);
-                return ((byte[])(obj));
-            }
-        }
-        
-        internal static byte[] gmail {
-            get {
-                object obj = ResourceManager.GetObject("gmail", resourceCulture);
-                return ((byte[])(obj));
-            }
-        }
-        
-        internal static byte[] outlookweb {
-            get {
-                object obj = ResourceManager.GetObject("outlookweb", resourceCulture);
-                return ((byte[])(obj));
-            }
-        }
-        
-        internal static byte[] thunderbird {
-            get {
-                object obj = ResourceManager.GetObject("thunderbird", resourceCulture);
-                return ((byte[])(obj));
-            }
-        }
-        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Byte[].
+        /// </summary>
         internal static byte[] apple_mail {
             get {
                 object obj = ResourceManager.GetObject("apple_mail", resourceCulture);
@@ -591,34 +109,219 @@ namespace NAPS2 {
             }
         }
         
-        internal static byte[] email_setting {
+        /// <summary>
+        ///   Looks up a localized resource of type System.Byte[].
+        /// </summary>
+        internal static byte[] application_cascade {
             get {
-                object obj = ResourceManager.GetObject("email_setting", resourceCulture);
+                object obj = ResourceManager.GetObject("application_cascade", resourceCulture);
                 return ((byte[])(obj));
             }
         }
         
-        internal static byte[] mail_yellow {
+        /// <summary>
+        ///   Looks up a localized resource of type System.Byte[].
+        /// </summary>
+        internal static byte[] arrow_down {
             get {
-                object obj = ResourceManager.GetObject("mail_yellow", resourceCulture);
+                object obj = ResourceManager.GetObject("arrow_down", resourceCulture);
                 return ((byte[])(obj));
             }
         }
         
-        internal static byte[] hourglass_grey {
+        /// <summary>
+        ///   Looks up a localized resource of type System.Byte[].
+        /// </summary>
+        internal static byte[] arrow_down_small {
             get {
-                object obj = ResourceManager.GetObject("hourglass_grey", resourceCulture);
+                object obj = ResourceManager.GetObject("arrow_down_small", resourceCulture);
                 return ((byte[])(obj));
             }
         }
         
-        internal static byte[] wireless16 {
+        /// <summary>
+        ///   Looks up a localized resource of type System.Byte[].
+        /// </summary>
+        internal static byte[] arrow_left {
             get {
-                object obj = ResourceManager.GetObject("wireless16", resourceCulture);
+                object obj = ResourceManager.GetObject("arrow_left", resourceCulture);
                 return ((byte[])(obj));
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized resource of type System.Byte[].
+        /// </summary>
+        internal static byte[] arrow_out {
+            get {
+                object obj = ResourceManager.GetObject("arrow_out", resourceCulture);
+                return ((byte[])(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Byte[].
+        /// </summary>
+        internal static byte[] arrow_refresh {
+            get {
+                object obj = ResourceManager.GetObject("arrow_refresh", resourceCulture);
+                return ((byte[])(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Byte[].
+        /// </summary>
+        internal static byte[] arrow_right {
+            get {
+                object obj = ResourceManager.GetObject("arrow_right", resourceCulture);
+                return ((byte[])(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Byte[].
+        /// </summary>
+        internal static byte[] arrow_rotate_anticlockwise {
+            get {
+                object obj = ResourceManager.GetObject("arrow_rotate_anticlockwise", resourceCulture);
+                return ((byte[])(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Byte[].
+        /// </summary>
+        internal static byte[] arrow_rotate_anticlockwise_small {
+            get {
+                object obj = ResourceManager.GetObject("arrow_rotate_anticlockwise_small", resourceCulture);
+                return ((byte[])(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Byte[].
+        /// </summary>
+        internal static byte[] arrow_rotate_clockwise {
+            get {
+                object obj = ResourceManager.GetObject("arrow_rotate_clockwise", resourceCulture);
+                return ((byte[])(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Byte[].
+        /// </summary>
+        internal static byte[] arrow_rotate_clockwise_small {
+            get {
+                object obj = ResourceManager.GetObject("arrow_rotate_clockwise_small", resourceCulture);
+                return ((byte[])(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Byte[].
+        /// </summary>
+        internal static byte[] arrow_switch {
+            get {
+                object obj = ResourceManager.GetObject("arrow_switch", resourceCulture);
+                return ((byte[])(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Byte[].
+        /// </summary>
+        internal static byte[] arrow_switch_small {
+            get {
+                object obj = ResourceManager.GetObject("arrow_switch_small", resourceCulture);
+                return ((byte[])(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Byte[].
+        /// </summary>
+        internal static byte[] arrow_up {
+            get {
+                object obj = ResourceManager.GetObject("arrow_up", resourceCulture);
+                return ((byte[])(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Byte[].
+        /// </summary>
+        internal static byte[] arrow_up_small {
+            get {
+                object obj = ResourceManager.GetObject("arrow_up_small", resourceCulture);
+                return ((byte[])(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Byte[].
+        /// </summary>
+        internal static byte[] blueprints {
+            get {
+                object obj = ResourceManager.GetObject("blueprints", resourceCulture);
+                return ((byte[])(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Byte[].
+        /// </summary>
+        internal static byte[] blueprints_small {
+            get {
+                object obj = ResourceManager.GetObject("blueprints_small", resourceCulture);
+                return ((byte[])(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Byte[].
+        /// </summary>
+        internal static byte[] btn_donate_LG {
+            get {
+                object obj = ResourceManager.GetObject("btn_donate_LG", resourceCulture);
+                return ((byte[])(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Byte[].
+        /// </summary>
+        internal static byte[] cancel {
+            get {
+                object obj = ResourceManager.GetObject("cancel", resourceCulture);
+                return ((byte[])(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Byte[].
+        /// </summary>
+        internal static byte[] cancel_small {
+            get {
+                object obj = ResourceManager.GetObject("cancel_small", resourceCulture);
+                return ((byte[])(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Byte[].
+        /// </summary>
+        internal static byte[] close {
+            get {
+                object obj = ResourceManager.GetObject("close", resourceCulture);
+                return ((byte[])(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Byte[].
+        /// </summary>
         internal static byte[] cog {
             get {
                 object obj = ResourceManager.GetObject("cog", resourceCulture);
@@ -626,6 +329,9 @@ namespace NAPS2 {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized resource of type System.Byte[].
+        /// </summary>
         internal static byte[] cog_small {
             get {
                 object obj = ResourceManager.GetObject("cog_small", resourceCulture);
@@ -633,27 +339,109 @@ namespace NAPS2 {
             }
         }
         
-        internal static byte[] information_small {
+        /// <summary>
+        ///   Looks up a localized resource of type System.Byte[].
+        /// </summary>
+        internal static byte[] color_gradient {
             get {
-                object obj = ResourceManager.GetObject("information_small", resourceCulture);
+                object obj = ResourceManager.GetObject("color_gradient", resourceCulture);
                 return ((byte[])(obj));
             }
         }
         
-        internal static byte[] favicon {
+        /// <summary>
+        ///   Looks up a localized resource of type System.Byte[].
+        /// </summary>
+        internal static byte[] color_management {
             get {
-                object obj = ResourceManager.GetObject("favicon", resourceCulture);
+                object obj = ResourceManager.GetObject("color_management", resourceCulture);
                 return ((byte[])(obj));
             }
         }
         
-        internal static byte[] exclamation {
+        /// <summary>
+        ///   Looks up a localized resource of type System.Byte[].
+        /// </summary>
+        internal static byte[] color_wheel {
             get {
-                object obj = ResourceManager.GetObject("exclamation", resourceCulture);
+                object obj = ResourceManager.GetObject("color_wheel", resourceCulture);
                 return ((byte[])(obj));
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized resource of type System.Byte[].
+        /// </summary>
+        internal static byte[] contrast {
+            get {
+                object obj = ResourceManager.GetObject("contrast", resourceCulture);
+                return ((byte[])(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Byte[].
+        /// </summary>
+        internal static byte[] contrast_high {
+            get {
+                object obj = ResourceManager.GetObject("contrast_high", resourceCulture);
+                return ((byte[])(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Byte[].
+        /// </summary>
+        internal static byte[] contrast_with_sun {
+            get {
+                object obj = ResourceManager.GetObject("contrast_with_sun", resourceCulture);
+                return ((byte[])(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Byte[].
+        /// </summary>
+        internal static byte[] control_play_blue {
+            get {
+                object obj = ResourceManager.GetObject("control_play_blue", resourceCulture);
+                return ((byte[])(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Byte[].
+        /// </summary>
+        internal static byte[] control_play_blue_small {
+            get {
+                object obj = ResourceManager.GetObject("control_play_blue_small", resourceCulture);
+                return ((byte[])(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Byte[].
+        /// </summary>
+        internal static byte[] cross {
+            get {
+                object obj = ResourceManager.GetObject("cross", resourceCulture);
+                return ((byte[])(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Byte[].
+        /// </summary>
+        internal static byte[] cross_small {
+            get {
+                object obj = ResourceManager.GetObject("cross_small", resourceCulture);
+                return ((byte[])(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Byte[].
+        /// </summary>
         internal static byte[] diskette {
             get {
                 object obj = ResourceManager.GetObject("diskette", resourceCulture);
@@ -661,6 +449,469 @@ namespace NAPS2 {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized resource of type System.Byte[].
+        /// </summary>
+        internal static byte[] email_attach {
+            get {
+                object obj = ResourceManager.GetObject("email_attach", resourceCulture);
+                return ((byte[])(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Byte[].
+        /// </summary>
+        internal static byte[] email_setting {
+            get {
+                object obj = ResourceManager.GetObject("email_setting", resourceCulture);
+                return ((byte[])(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Byte[].
+        /// </summary>
+        internal static byte[] email_small {
+            get {
+                object obj = ResourceManager.GetObject("email_small", resourceCulture);
+                return ((byte[])(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Byte[].
+        /// </summary>
+        internal static byte[] exclamation {
+            get {
+                object obj = ResourceManager.GetObject("exclamation", resourceCulture);
+                return ((byte[])(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Byte[].
+        /// </summary>
+        internal static byte[] favicon {
+            get {
+                object obj = ResourceManager.GetObject("favicon", resourceCulture);
+                return ((byte[])(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Byte[].
+        /// </summary>
+        internal static byte[] file_extension_pdf {
+            get {
+                object obj = ResourceManager.GetObject("file_extension_pdf", resourceCulture);
+                return ((byte[])(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Byte[].
+        /// </summary>
+        internal static byte[] file_extension_pdf_small {
+            get {
+                object obj = ResourceManager.GetObject("file_extension_pdf_small", resourceCulture);
+                return ((byte[])(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Byte[].
+        /// </summary>
+        internal static byte[] folder_picture {
+            get {
+                object obj = ResourceManager.GetObject("folder_picture", resourceCulture);
+                return ((byte[])(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Byte[].
+        /// </summary>
+        internal static byte[] gmail {
+            get {
+                object obj = ResourceManager.GetObject("gmail", resourceCulture);
+                return ((byte[])(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Byte[].
+        /// </summary>
+        internal static byte[] hourglass_grey {
+            get {
+                object obj = ResourceManager.GetObject("hourglass_grey", resourceCulture);
+                return ((byte[])(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Byte[].
+        /// </summary>
+        internal static byte[] image_edit {
+            get {
+                object obj = ResourceManager.GetObject("image_edit", resourceCulture);
+                return ((byte[])(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Byte[].
+        /// </summary>
+        internal static byte[] info_rhombus {
+            get {
+                object obj = ResourceManager.GetObject("info_rhombus", resourceCulture);
+                return ((byte[])(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Byte[].
+        /// </summary>
+        internal static byte[] information {
+            get {
+                object obj = ResourceManager.GetObject("information", resourceCulture);
+                return ((byte[])(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Byte[].
+        /// </summary>
+        internal static byte[] information_small {
+            get {
+                object obj = ResourceManager.GetObject("information_small", resourceCulture);
+                return ((byte[])(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Byte[].
+        /// </summary>
+        internal static byte[] key_small {
+            get {
+                object obj = ResourceManager.GetObject("key_small", resourceCulture);
+                return ((byte[])(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Byte[].
+        /// </summary>
+        internal static byte[] mail_yellow {
+            get {
+                object obj = ResourceManager.GetObject("mail_yellow", resourceCulture);
+                return ((byte[])(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Byte[].
+        /// </summary>
+        internal static byte[] outlookweb {
+            get {
+                object obj = ResourceManager.GetObject("outlookweb", resourceCulture);
+                return ((byte[])(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Byte[].
+        /// </summary>
+        internal static byte[] pdf_email {
+            get {
+                object obj = ResourceManager.GetObject("pdf_email", resourceCulture);
+                return ((byte[])(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Byte[].
+        /// </summary>
+        internal static byte[] pencil {
+            get {
+                object obj = ResourceManager.GetObject("pencil", resourceCulture);
+                return ((byte[])(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Byte[].
+        /// </summary>
+        internal static byte[] pencil_small {
+            get {
+                object obj = ResourceManager.GetObject("pencil_small", resourceCulture);
+                return ((byte[])(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Byte[].
+        /// </summary>
+        internal static byte[] picture {
+            get {
+                object obj = ResourceManager.GetObject("picture", resourceCulture);
+                return ((byte[])(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Byte[].
+        /// </summary>
+        internal static byte[] picture_edit {
+            get {
+                object obj = ResourceManager.GetObject("picture_edit", resourceCulture);
+                return ((byte[])(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Byte[].
+        /// </summary>
+        internal static byte[] picture_save {
+            get {
+                object obj = ResourceManager.GetObject("picture_save", resourceCulture);
+                return ((byte[])(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Byte[].
+        /// </summary>
+        internal static byte[] picture_small {
+            get {
+                object obj = ResourceManager.GetObject("picture_small", resourceCulture);
+                return ((byte[])(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Byte[].
+        /// </summary>
+        internal static byte[] pictures {
+            get {
+                object obj = ResourceManager.GetObject("pictures", resourceCulture);
+                return ((byte[])(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Byte[].
+        /// </summary>
+        internal static byte[] printer {
+            get {
+                object obj = ResourceManager.GetObject("printer", resourceCulture);
+                return ((byte[])(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Byte[].
+        /// </summary>
+        internal static byte[] scanner_128 {
+            get {
+                object obj = ResourceManager.GetObject("scanner_128", resourceCulture);
+                return ((byte[])(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Byte[].
+        /// </summary>
+        internal static byte[] scanner_16 {
+            get {
+                object obj = ResourceManager.GetObject("scanner_16", resourceCulture);
+                return ((byte[])(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Byte[].
+        /// </summary>
+        internal static byte[] scanner_32 {
+            get {
+                object obj = ResourceManager.GetObject("scanner_32", resourceCulture);
+                return ((byte[])(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Byte[].
+        /// </summary>
+        internal static byte[] scanner_48 {
+            get {
+                object obj = ResourceManager.GetObject("scanner_48", resourceCulture);
+                return ((byte[])(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Byte[].
+        /// </summary>
+        internal static byte[] scanner_64 {
+            get {
+                object obj = ResourceManager.GetObject("scanner_64", resourceCulture);
+                return ((byte[])(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Byte[].
+        /// </summary>
+        internal static byte[] scanner_default {
+            get {
+                object obj = ResourceManager.GetObject("scanner_default", resourceCulture);
+                return ((byte[])(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Byte[].
+        /// </summary>
+        internal static byte[] scanner_lock {
+            get {
+                object obj = ResourceManager.GetObject("scanner_lock", resourceCulture);
+                return ((byte[])(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Byte[].
+        /// </summary>
+        internal static byte[] scanner_lock_default {
+            get {
+                object obj = ResourceManager.GetObject("scanner_lock_default", resourceCulture);
+                return ((byte[])(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Byte[].
+        /// </summary>
+        internal static byte[] scanner_wireless {
+            get {
+                object obj = ResourceManager.GetObject("scanner_wireless", resourceCulture);
+                return ((byte[])(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Byte[].
+        /// </summary>
+        internal static byte[] sharpen {
+            get {
+                object obj = ResourceManager.GetObject("sharpen", resourceCulture);
+                return ((byte[])(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Byte[].
+        /// </summary>
+        internal static byte[] text {
+            get {
+                object obj = ResourceManager.GetObject("text", resourceCulture);
+                return ((byte[])(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Byte[].
+        /// </summary>
+        internal static byte[] text_small {
+            get {
+                object obj = ResourceManager.GetObject("text_small", resourceCulture);
+                return ((byte[])(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Byte[].
+        /// </summary>
+        internal static byte[] thunderbird {
+            get {
+                object obj = ResourceManager.GetObject("thunderbird", resourceCulture);
+                return ((byte[])(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Byte[].
+        /// </summary>
+        internal static byte[] tick {
+            get {
+                object obj = ResourceManager.GetObject("tick", resourceCulture);
+                return ((byte[])(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Byte[].
+        /// </summary>
+        internal static byte[] tick_small {
+            get {
+                object obj = ResourceManager.GetObject("tick_small", resourceCulture);
+                return ((byte[])(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Byte[].
+        /// </summary>
+        internal static byte[] transform_crop {
+            get {
+                object obj = ResourceManager.GetObject("transform_crop", resourceCulture);
+                return ((byte[])(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Byte[].
+        /// </summary>
+        internal static byte[] transform_flip {
+            get {
+                object obj = ResourceManager.GetObject("transform_flip", resourceCulture);
+                return ((byte[])(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Byte[].
+        /// </summary>
+        internal static byte[] weather_sun {
+            get {
+                object obj = ResourceManager.GetObject("weather_sun", resourceCulture);
+                return ((byte[])(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Byte[].
+        /// </summary>
+        internal static byte[] wireless16 {
+            get {
+                object obj = ResourceManager.GetObject("wireless16", resourceCulture);
+                return ((byte[])(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Byte[].
+        /// </summary>
+        internal static byte[] world {
+            get {
+                object obj = ResourceManager.GetObject("world", resourceCulture);
+                return ((byte[])(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Byte[].
+        /// </summary>
         internal static byte[] zoom {
             get {
                 object obj = ResourceManager.GetObject("zoom", resourceCulture);
@@ -668,6 +919,39 @@ namespace NAPS2 {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized resource of type System.Byte[].
+        /// </summary>
+        internal static byte[] zoom_actual {
+            get {
+                object obj = ResourceManager.GetObject("zoom_actual", resourceCulture);
+                return ((byte[])(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Byte[].
+        /// </summary>
+        internal static byte[] zoom_in {
+            get {
+                object obj = ResourceManager.GetObject("zoom_in", resourceCulture);
+                return ((byte[])(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Byte[].
+        /// </summary>
+        internal static byte[] zoom_out {
+            get {
+                object obj = ResourceManager.GetObject("zoom_out", resourceCulture);
+                return ((byte[])(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Byte[].
+        /// </summary>
         internal static byte[] zoom_small {
             get {
                 object obj = ResourceManager.GetObject("zoom_small", resourceCulture);
diff --git a/NAPS2.Lib/Icons.resx b/NAPS2.Lib/Icons.resx
index a9e756f66..afe9c58f8 100644
--- a/NAPS2.Lib/Icons.resx
+++ b/NAPS2.Lib/Icons.resx
@@ -175,9 +175,6 @@
   <data name="scanner_32" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>Icons\scanner-32-rev2.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
-  <data name="scanner_48_old" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>Icons\scanner-48-rev1.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
   <data name="scanner_48" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>Icons\scanner-48-rev2.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
@@ -188,13 +185,16 @@
     <value>Icons\scanner-128.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="scanner_default" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>Icons\scanner-default.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>Icons\scanner-default-rev2.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="scanner_lock_default" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>Icons\scanner-lock-default.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>Icons\scanner-lock-default-rev2.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="scanner_lock" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>Icons\scanner-lock.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>Icons\scanner-lock-rev2.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="scanner_wireless" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>Icons\scanner-wireless-rev2.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="transform_flip" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>Icons\transform_flip.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
diff --git a/NAPS2.Lib/Icons/scanner-default.png b/NAPS2.Lib/Icons/scanner-default-rev1.png
similarity index 100%
rename from NAPS2.Lib/Icons/scanner-default.png
rename to NAPS2.Lib/Icons/scanner-default-rev1.png
diff --git a/NAPS2.Lib/Icons/scanner-default-rev2.png b/NAPS2.Lib/Icons/scanner-default-rev2.png
new file mode 100644
index 000000000..cd6caa25e
Binary files /dev/null and b/NAPS2.Lib/Icons/scanner-default-rev2.png differ
diff --git a/NAPS2.Lib/Icons/scanner-lock-default.png b/NAPS2.Lib/Icons/scanner-lock-default-rev1.png
similarity index 100%
rename from NAPS2.Lib/Icons/scanner-lock-default.png
rename to NAPS2.Lib/Icons/scanner-lock-default-rev1.png
diff --git a/NAPS2.Lib/Icons/scanner-lock-default-rev2.png b/NAPS2.Lib/Icons/scanner-lock-default-rev2.png
new file mode 100644
index 000000000..503152430
Binary files /dev/null and b/NAPS2.Lib/Icons/scanner-lock-default-rev2.png differ
diff --git a/NAPS2.Lib/Icons/scanner-lock.png b/NAPS2.Lib/Icons/scanner-lock-rev1.png
similarity index 100%
rename from NAPS2.Lib/Icons/scanner-lock.png
rename to NAPS2.Lib/Icons/scanner-lock-rev1.png
diff --git a/NAPS2.Lib/Icons/scanner-lock-rev2.png b/NAPS2.Lib/Icons/scanner-lock-rev2.png
new file mode 100644
index 000000000..e86a6f791
Binary files /dev/null and b/NAPS2.Lib/Icons/scanner-lock-rev2.png differ
diff --git a/NAPS2.Lib/Icons/scanner-wireless-rev2.png b/NAPS2.Lib/Icons/scanner-wireless-rev2.png
new file mode 100644
index 000000000..e2c1f6bdb
Binary files /dev/null and b/NAPS2.Lib/Icons/scanner-wireless-rev2.png differ
diff --git a/NAPS2.Lib/Icons/wireless16_filled.png b/NAPS2.Lib/Icons/wireless16_filled.png
new file mode 100644
index 000000000..579441fe7
Binary files /dev/null and b/NAPS2.Lib/Icons/wireless16_filled.png differ