diff --git a/NAPS2.Core/Icons.Designer.cs b/NAPS2.Core/Icons.Designer.cs
index 7865dca31..abb1b4f9d 100644
--- a/NAPS2.Core/Icons.Designer.cs
+++ b/NAPS2.Core/Icons.Designer.cs
@@ -420,6 +420,16 @@ namespace NAPS2 {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap email_setting {
+            get {
+                object obj = ResourceManager.GetObject("email_setting", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
@@ -490,6 +500,16 @@ namespace NAPS2 {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap mail_yellow {
+            get {
+                object obj = ResourceManager.GetObject("mail_yellow", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
diff --git a/NAPS2.Core/Icons.resx b/NAPS2.Core/Icons.resx
index 772fc5f45..fe24c5c12 100644
--- a/NAPS2.Core/Icons.resx
+++ b/NAPS2.Core/Icons.resx
@@ -328,4 +328,10 @@
   <data name="outlookweb" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>Icons\outlookweb.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="email_setting" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>Icons\email_setting.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="mail_yellow" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>Icons\mail_yellow.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/NAPS2.Core/Icons/email_setting.png b/NAPS2.Core/Icons/email_setting.png
new file mode 100644
index 000000000..5889e6da9
Binary files /dev/null and b/NAPS2.Core/Icons/email_setting.png differ
diff --git a/NAPS2.Core/Icons/mail_yellow.png b/NAPS2.Core/Icons/mail_yellow.png
new file mode 100644
index 000000000..609572f7b
Binary files /dev/null and b/NAPS2.Core/Icons/mail_yellow.png differ
diff --git a/NAPS2.Core/NAPS2.Core.csproj b/NAPS2.Core/NAPS2.Core.csproj
index 64cb7930e..640c8ffdf 100644
--- a/NAPS2.Core/NAPS2.Core.csproj
+++ b/NAPS2.Core/NAPS2.Core.csproj
@@ -5275,10 +5275,13 @@
     <Content Include="Icons\contrast_with_sun.ico" />
     <Content Include="Icons\control_play_blue-small.png" />
     <Content Include="Icons\email.ico" />
+    <None Include="Icons\email.png" />
+    <None Include="Icons\email_setting.png" />
     <Content Include="Icons\file_extension_pdf.ico" />
     <None Include="Icons\gmail.png" />
     <Content Include="Icons\image_edit.png" />
     <None Include="Icons\outlookweb.png" />
+    <None Include="Icons\mail_yellow.png" />
     <Content Include="Icons\picture.ico" />
     <Content Include="Icons\pictures.png" />
     <Content Include="Icons\picture_edit.png" />
diff --git a/NAPS2.Core/WinForms/FEmailProvider.cs b/NAPS2.Core/WinForms/FEmailProvider.cs
index 92825a138..14bb56d97 100644
--- a/NAPS2.Core/WinForms/FEmailProvider.cs
+++ b/NAPS2.Core/WinForms/FEmailProvider.cs
@@ -43,7 +43,7 @@ namespace NAPS2.WinForms
                 providerWidgets.Add(new EmailProviderWidget
                 {
                     ProviderType = EmailProviderType.System,
-                    ProviderIcon = systemEmailClients.GetIcon(clientName),
+                    ProviderIcon = systemEmailClients.GetIcon(clientName) ?? Icons.mail_yellow,
                     ProviderName = clientName,
                     ClickAction = () => ChooseSystem(clientName)
                 });
@@ -74,7 +74,7 @@ namespace NAPS2.WinForms
             providerWidgets.Add(new EmailProviderWidget
             {
                 ProviderType = EmailProviderType.CustomSmtp,
-                ProviderIcon = null,
+                ProviderIcon = Icons.email_setting,
                 ProviderName = EmailProviderType.CustomSmtp.Description(),
                 ClickAction = ChooseCustomSmtp
             });