diff --git a/ShareX.HistoryLib/ImageHistoryForm.Designer.cs b/ShareX.HistoryLib/ImageHistoryForm.Designer.cs
index da82fe8ad..e65ced29e 100644
--- a/ShareX.HistoryLib/ImageHistoryForm.Designer.cs
+++ b/ShareX.HistoryLib/ImageHistoryForm.Designer.cs
@@ -42,7 +42,11 @@ private void InitializeComponent()
             this.tsmiThumbnailSize150 = new System.Windows.Forms.ToolStripMenuItem();
             this.tsmiThumbnailSize200 = new System.Windows.Forms.ToolStripMenuItem();
             this.tsmiThumbnailSize250 = new System.Windows.Forms.ToolStripMenuItem();
-            this.tsbQuickList = new System.Windows.Forms.ToolStripButton();
+            this.tsddbMaxImageLimit = new System.Windows.Forms.ToolStripDropDownButton();
+            this.tsmiMaxImageLimit0 = new System.Windows.Forms.ToolStripMenuItem();
+            this.tsmiMaxImageLimit100 = new System.Windows.Forms.ToolStripMenuItem();
+            this.tsmiMaxImageLimit250 = new System.Windows.Forms.ToolStripMenuItem();
+            this.tsmiMaxImageLimit1000 = new System.Windows.Forms.ToolStripMenuItem();
             this.tscMain.ContentPanel.SuspendLayout();
             this.tscMain.TopToolStripPanel.SuspendLayout();
             this.tscMain.SuspendLayout();
@@ -87,7 +91,7 @@ private void InitializeComponent()
             this.tsMain.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.tsddbViewMode,
             this.tsddbThumbnailSize,
-            this.tsbQuickList});
+            this.tsddbMaxImageLimit});
             this.tsMain.Name = "tsMain";
             // 
             // tsddbViewMode
@@ -161,14 +165,40 @@ private void InitializeComponent()
             resources.ApplyResources(this.tsmiThumbnailSize250, "tsmiThumbnailSize250");
             this.tsmiThumbnailSize250.Click += new System.EventHandler(this.tsmiThumbnailSize250_Click);
             // 
-            // tsbQuickList
+            // tsddbMaxImageLimit
             // 
-            this.tsbQuickList.CheckOnClick = true;
-            this.tsbQuickList.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
-            this.tsbQuickList.Margin = new System.Windows.Forms.Padding(5, 1, 0, 2);
-            this.tsbQuickList.Name = "tsbQuickList";
-            resources.ApplyResources(this.tsbQuickList, "tsbQuickList");
-            this.tsbQuickList.Click += new System.EventHandler(this.tsbQuickList_Click);
+            this.tsddbMaxImageLimit.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
+            this.tsddbMaxImageLimit.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.tsmiMaxImageLimit100,
+            this.tsmiMaxImageLimit250,
+            this.tsmiMaxImageLimit1000,
+            this.tsmiMaxImageLimit0});
+            resources.ApplyResources(this.tsddbMaxImageLimit, "tsddbMaxImageLimit");
+            this.tsddbMaxImageLimit.Name = "tsddbMaxImageLimit";
+            // 
+            // tsmiMaxImageLimit0
+            // 
+            this.tsmiMaxImageLimit0.Name = "tsmiMaxImageLimit0";
+            resources.ApplyResources(this.tsmiMaxImageLimit0, "tsmiMaxImageLimit0");
+            this.tsmiMaxImageLimit0.Click += new System.EventHandler(this.tsmiMaxImageLimit0_Click);
+            // 
+            // tsmiMaxImageLimit100
+            // 
+            this.tsmiMaxImageLimit100.Name = "tsmiMaxImageLimit100";
+            resources.ApplyResources(this.tsmiMaxImageLimit100, "tsmiMaxImageLimit100");
+            this.tsmiMaxImageLimit100.Click += new System.EventHandler(this.tsmiMaxImageLimit100_Click);
+            // 
+            // tsmiMaxImageLimit250
+            // 
+            this.tsmiMaxImageLimit250.Name = "tsmiMaxImageLimit250";
+            resources.ApplyResources(this.tsmiMaxImageLimit250, "tsmiMaxImageLimit250");
+            this.tsmiMaxImageLimit250.Click += new System.EventHandler(this.tsmiMaxImageLimit250_Click);
+            // 
+            // tsmiMaxImageLimit1000
+            // 
+            this.tsmiMaxImageLimit1000.Name = "tsmiMaxImageLimit1000";
+            resources.ApplyResources(this.tsmiMaxImageLimit1000, "tsmiMaxImageLimit1000");
+            this.tsmiMaxImageLimit1000.Click += new System.EventHandler(this.tsmiMaxImageLimit1000_Click);
             // 
             // ImageHistoryForm
             // 
@@ -205,6 +235,10 @@ private void InitializeComponent()
         private System.Windows.Forms.ToolStripMenuItem tsmiViewModeThumbnails;
         private System.Windows.Forms.ToolStripMenuItem tsmiViewModeGallery;
         private System.Windows.Forms.ToolStripMenuItem tsmiViewModePane;
-        private System.Windows.Forms.ToolStripButton tsbQuickList;
+        private System.Windows.Forms.ToolStripDropDownButton tsddbMaxImageLimit;
+        private System.Windows.Forms.ToolStripMenuItem tsmiMaxImageLimit100;
+        private System.Windows.Forms.ToolStripMenuItem tsmiMaxImageLimit250;
+        private System.Windows.Forms.ToolStripMenuItem tsmiMaxImageLimit1000;
+        private System.Windows.Forms.ToolStripMenuItem tsmiMaxImageLimit0;
     }
 }
\ No newline at end of file
diff --git a/ShareX.HistoryLib/ImageHistoryForm.cs b/ShareX.HistoryLib/ImageHistoryForm.cs
index 2842aaa20..19f091c1f 100644
--- a/ShareX.HistoryLib/ImageHistoryForm.cs
+++ b/ShareX.HistoryLib/ImageHistoryForm.cs
@@ -52,7 +52,6 @@ public ImageHistoryForm(string historyPath, int viewMode, Size thumbnailSize, in
             Icon = ShareXResources.Icon;
 
             HistoryPath = historyPath;
-            MaxItemCount = maxItemCount;
 
             ViewMode = viewMode.Between(0, 3);
             ilvImages.View = (View)ViewMode;
@@ -94,7 +93,24 @@ public ImageHistoryForm(string historyPath, int viewMode, Size thumbnailSize, in
                     break;
             }
 
-            tsbQuickList.Checked = MaxItemCount > 0;
+            MaxItemCount = maxItemCount;
+
+            if (MaxItemCount <= 0)
+            {
+                tsmiMaxImageLimit0.RadioCheck();
+            }
+            else if (MaxItemCount <= 100)
+            {
+                tsmiMaxImageLimit100.RadioCheck();
+            }
+            else if (MaxItemCount <= 250)
+            {
+                tsmiMaxImageLimit250.RadioCheck();
+            }
+            else
+            {
+                tsmiMaxImageLimit1000.RadioCheck();
+            }
 
             him = new HistoryItemManager();
             him.GetHistoryItems += him_GetHistoryItems;
@@ -241,17 +257,31 @@ private void tsmiThumbnailSize250_Click(object sender, EventArgs e)
             ThumbnailSize = ilvImages.ThumbnailSize;
         }
 
-        private void tsbQuickList_Click(object sender, EventArgs e)
+        private void tsmiMaxImageLimit100_Click(object sender, EventArgs e)
         {
-            if (tsbQuickList.Checked)
-            {
-                MaxItemCount = 100;
-            }
-            else
-            {
-                MaxItemCount = 0;
-            }
+            tsmiMaxImageLimit100.RadioCheck();
+            MaxItemCount = 100;
+            RefreshHistoryItems();
+        }
 
+        private void tsmiMaxImageLimit250_Click(object sender, EventArgs e)
+        {
+            tsmiMaxImageLimit250.RadioCheck();
+            MaxItemCount = 250;
+            RefreshHistoryItems();
+        }
+
+        private void tsmiMaxImageLimit1000_Click(object sender, EventArgs e)
+        {
+            tsmiMaxImageLimit1000.RadioCheck();
+            MaxItemCount = 1000;
+            RefreshHistoryItems();
+        }
+
+        private void tsmiMaxImageLimit0_Click(object sender, EventArgs e)
+        {
+            tsmiMaxImageLimit0.RadioCheck();
+            MaxItemCount = 0;
             RefreshHistoryItems();
         }
 
diff --git a/ShareX.HistoryLib/ImageHistoryForm.de.resx b/ShareX.HistoryLib/ImageHistoryForm.de.resx
index 402837997..9877c6175 100644
--- a/ShareX.HistoryLib/ImageHistoryForm.de.resx
+++ b/ShareX.HistoryLib/ImageHistoryForm.de.resx
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -123,14 +123,14 @@
   <data name="tsbQuickList.Text" xml:space="preserve">
     <value>Nur 100 Bilder anzeigen</value>
   </data>
-  <data name="tsddbThumbnailSize.Text" xml:space="preserve">
-    <value>Thumbnailgröße</value>
+  <data name="tsmiViewModeGallery.Text" xml:space="preserve">
+    <value>Galerie</value>
   </data>
   <data name="tsddbViewMode.Text" xml:space="preserve">
     <value>Anzeigemodus</value>
   </data>
-  <data name="tsmiViewModeGallery.Text" xml:space="preserve">
-    <value>Galerie</value>
+  <data name="tsddbThumbnailSize.Text" xml:space="preserve">
+    <value>Thumbnailgröße</value>
   </data>
   <data name="tsmiViewModePane.Text" xml:space="preserve">
     <value>Vorschaufenster</value>
diff --git a/ShareX.HistoryLib/ImageHistoryForm.es.resx b/ShareX.HistoryLib/ImageHistoryForm.es.resx
index 7aab4cf84..01eb26dbd 100644
--- a/ShareX.HistoryLib/ImageHistoryForm.es.resx
+++ b/ShareX.HistoryLib/ImageHistoryForm.es.resx
@@ -123,15 +123,15 @@
   <data name="tsbQuickList.Text" xml:space="preserve">
     <value>Mostrar sólo los últimos 100 imágenes</value>
   </data>
+  <data name="tsmiViewModeGallery.Text" xml:space="preserve">
+    <value>Galería</value>
+  </data>
   <data name="tsddbViewMode.Text" xml:space="preserve">
     <value>Modo de visualización</value>
   </data>
   <data name="tsddbThumbnailSize.Text" xml:space="preserve">
     <value>Tamaño miniatura</value>
   </data>
-  <data name="tsmiViewModeGallery.Text" xml:space="preserve">
-    <value>Galería</value>
-  </data>
   <data name="tsmiViewModePane.Text" xml:space="preserve">
     <value>Ventana</value>
   </data>
diff --git a/ShareX.HistoryLib/ImageHistoryForm.fr.resx b/ShareX.HistoryLib/ImageHistoryForm.fr.resx
index 52c6cc1f9..9abadaed6 100644
--- a/ShareX.HistoryLib/ImageHistoryForm.fr.resx
+++ b/ShareX.HistoryLib/ImageHistoryForm.fr.resx
@@ -120,22 +120,22 @@
   <data name="tsmiViewModeGallery.Text" xml:space="preserve">
     <value>Gallerie</value>
   </data>
-  <data name="$this.Text" xml:space="preserve">
-    <value>ShareX - Historique des images</value>
-  </data>
   <data name="tsddbViewMode.Text" xml:space="preserve">
     <value>Mode de vue</value>
   </data>
-  <data name="tsbQuickList.Text" xml:space="preserve">
-    <value>Afficher seulement les 100 dernières images</value>
-  </data>
-  <data name="tsmiViewModePane.Text" xml:space="preserve">
-    <value>Carreau</value>
-  </data>
   <data name="tsddbThumbnailSize.Text" xml:space="preserve">
     <value>Taille de la miniature</value>
   </data>
+  <data name="tsmiViewModePane.Text" xml:space="preserve">
+    <value>Carreau</value>
+  </data>
   <data name="tsmiViewModeThumbnails.Text" xml:space="preserve">
     <value>Miniatures</value>
   </data>
+  <data name="$this.Text" xml:space="preserve">
+    <value>ShareX - Historique des images</value>
+  </data>
+  <data name="tsbQuickList.Text" xml:space="preserve">
+    <value>Afficher seulement les 100 dernières images</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/ShareX.HistoryLib/ImageHistoryForm.hu.resx b/ShareX.HistoryLib/ImageHistoryForm.hu.resx
index 78a6fbdac..098b2235b 100644
--- a/ShareX.HistoryLib/ImageHistoryForm.hu.resx
+++ b/ShareX.HistoryLib/ImageHistoryForm.hu.resx
@@ -123,14 +123,14 @@
   <data name="tsbQuickList.Text" xml:space="preserve">
     <value>Csak a legutóbbi 100 kép mutatása</value>
   </data>
-  <data name="tsddbThumbnailSize.Text" xml:space="preserve">
-    <value>Előnézeti kép méret</value>
+  <data name="tsmiViewModeGallery.Text" xml:space="preserve">
+    <value>Galéria</value>
   </data>
   <data name="tsddbViewMode.Text" xml:space="preserve">
     <value>Nézet mód</value>
   </data>
-  <data name="tsmiViewModeGallery.Text" xml:space="preserve">
-    <value>Galéria</value>
+  <data name="tsddbThumbnailSize.Text" xml:space="preserve">
+    <value>Előnézeti kép méret</value>
   </data>
   <data name="tsmiViewModePane.Text" xml:space="preserve">
     <value>Osztásmező</value>
diff --git a/ShareX.HistoryLib/ImageHistoryForm.ko-KR.resx b/ShareX.HistoryLib/ImageHistoryForm.ko-KR.resx
index f6025634f..a66505dbf 100644
--- a/ShareX.HistoryLib/ImageHistoryForm.ko-KR.resx
+++ b/ShareX.HistoryLib/ImageHistoryForm.ko-KR.resx
@@ -123,19 +123,19 @@
   <data name="tsbQuickList.Text" xml:space="preserve">
     <value>최근 100개의 이미지만 표시하기</value>
   </data>
-  <data name="tsddbThumbnailSize.Text" xml:space="preserve">
-    <value>섬네일 크기</value>
-  </data>
   <data name="tsmiViewModeGallery.Text" xml:space="preserve">
     <value>갤러리</value>
   </data>
-  <data name="tsmiViewModeThumbnails.Text" xml:space="preserve">
-    <value>섬네일</value>
-  </data>
   <data name="tsddbViewMode.Text" xml:space="preserve">
     <value>보기 방식</value>
   </data>
+  <data name="tsddbThumbnailSize.Text" xml:space="preserve">
+    <value>섬네일 크기</value>
+  </data>
   <data name="tsmiViewModePane.Text" xml:space="preserve">
     <value>구획</value>
   </data>
+  <data name="tsmiViewModeThumbnails.Text" xml:space="preserve">
+    <value>섬네일</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/ShareX.HistoryLib/ImageHistoryForm.nl-NL.resx b/ShareX.HistoryLib/ImageHistoryForm.nl-NL.resx
index 0f5a22f3d..9dd20559e 100644
--- a/ShareX.HistoryLib/ImageHistoryForm.nl-NL.resx
+++ b/ShareX.HistoryLib/ImageHistoryForm.nl-NL.resx
@@ -123,14 +123,14 @@
   <data name="tsbQuickList.Text" xml:space="preserve">
     <value>Toon enkel de laatste  100 afbeeldingen</value>
   </data>
-  <data name="tsddbThumbnailSize.Text" xml:space="preserve">
-    <value>Afmetingen miniatuur</value>
+  <data name="tsmiViewModeGallery.Text" xml:space="preserve">
+    <value>Gallerij</value>
   </data>
   <data name="tsddbViewMode.Text" xml:space="preserve">
     <value>Modus</value>
   </data>
-  <data name="tsmiViewModeGallery.Text" xml:space="preserve">
-    <value>Gallerij</value>
+  <data name="tsddbThumbnailSize.Text" xml:space="preserve">
+    <value>Afmetingen miniatuur</value>
   </data>
   <data name="tsmiViewModePane.Text" xml:space="preserve">
     <value>Paneel</value>
diff --git a/ShareX.HistoryLib/ImageHistoryForm.pt-BR.resx b/ShareX.HistoryLib/ImageHistoryForm.pt-BR.resx
index 2429ddfdd..979bc563d 100644
--- a/ShareX.HistoryLib/ImageHistoryForm.pt-BR.resx
+++ b/ShareX.HistoryLib/ImageHistoryForm.pt-BR.resx
@@ -123,14 +123,14 @@
   <data name="tsbQuickList.Text" xml:space="preserve">
     <value>Mostrar somente as últimas 100 imagens</value>
   </data>
-  <data name="tsddbThumbnailSize.Text" xml:space="preserve">
-    <value>Tamanho da miniatura</value>
+  <data name="tsmiViewModeGallery.Text" xml:space="preserve">
+    <value>Galeria</value>
   </data>
   <data name="tsddbViewMode.Text" xml:space="preserve">
     <value>Modo de visualização</value>
   </data>
-  <data name="tsmiViewModeGallery.Text" xml:space="preserve">
-    <value>Galeria</value>
+  <data name="tsddbThumbnailSize.Text" xml:space="preserve">
+    <value>Tamanho da miniatura</value>
   </data>
   <data name="tsmiViewModePane.Text" xml:space="preserve">
     <value>Painel</value>
diff --git a/ShareX.HistoryLib/ImageHistoryForm.resx b/ShareX.HistoryLib/ImageHistoryForm.resx
index 06dc12ce6..eafc36b1e 100644
--- a/ShareX.HistoryLib/ImageHistoryForm.resx
+++ b/ShareX.HistoryLib/ImageHistoryForm.resx
@@ -222,62 +222,104 @@
   <data name="tsmiViewModeGallery.Size" type="System.Drawing.Size, System.Drawing">
     <value>152, 22</value>
   </data>
-  <data name="tsmiViewModeGallery.Text" xml:space="preserve">
-    <value>Gallery</value>
-  </data>
   <data name="tsmiViewModePane.Size" type="System.Drawing.Size, System.Drawing">
     <value>152, 22</value>
   </data>
-  <data name="tsmiViewModePane.Text" xml:space="preserve">
-    <value>Pane</value>
-  </data>
   <data name="tsddbViewMode.Size" type="System.Drawing.Size, System.Drawing">
     <value>79, 20</value>
   </data>
-  <data name="tsddbViewMode.Text" xml:space="preserve">
-    <value>View mode</value>
+  <data name="tsmiViewModeGallery.Text" xml:space="preserve">
+    <value>Gallery</value>
   </data>
   <data name="tsmiThumbnailSize75.Size" type="System.Drawing.Size, System.Drawing">
     <value>152, 22</value>
   </data>
+  <data name="tsmiThumbnailSize100.Size" type="System.Drawing.Size, System.Drawing">
+    <value>152, 22</value>
+  </data>
+  <data name="tsmiThumbnailSize150.Size" type="System.Drawing.Size, System.Drawing">
+    <value>152, 22</value>
+  </data>
+  <data name="tsmiThumbnailSize200.Size" type="System.Drawing.Size, System.Drawing">
+    <value>152, 22</value>
+  </data>
+  <data name="tsmiThumbnailSize250.Size" type="System.Drawing.Size, System.Drawing">
+    <value>152, 22</value>
+  </data>
+  <data name="tsddbThumbnailSize.Size" type="System.Drawing.Size, System.Drawing">
+    <value>100, 20</value>
+  </data>
+  <data name="tsmiViewModePane.Text" xml:space="preserve">
+    <value>Pane</value>
+  </data>
+  <data name="tsmiMaxImageLimit100.Size" type="System.Drawing.Size, System.Drawing">
+    <value>152, 22</value>
+  </data>
   <data name="tsmiThumbnailSize75.Text" xml:space="preserve">
     <value>75 x 75</value>
-  <comment>@Invariant</comment></data>
-  <data name="tsmiThumbnailSize100.Size" type="System.Drawing.Size, System.Drawing">
+  </data>
+  <data name="tsddbViewMode.Text" xml:space="preserve">
+    <value>View mode</value>
+  </data>
+  <data name="tsmiMaxImageLimit250.Size" type="System.Drawing.Size, System.Drawing">
+    <value>152, 22</value>
+  </data>
+  <data name="tsmiMaxImageLimit250.Text" xml:space="preserve">
+    <value>Last 250</value>
+  </data>
+  <data name="tsddbMaxImageLimit.Text" xml:space="preserve">
+    <value>Image count limit</value>
+  </data>
+  <data name="tsmiMaxImageLimit0.Text" xml:space="preserve">
+    <value>No limit</value>
+  </data>
+  <data name="tsmiMaxImageLimit1000.Text" xml:space="preserve">
+    <value>Last 1000</value>
+  </data>
+  <data name="tsmiMaxImageLimit1000.Size" type="System.Drawing.Size, System.Drawing">
     <value>152, 22</value>
   </data>
   <data name="tsmiThumbnailSize100.Text" xml:space="preserve">
     <value>100 x 100</value>
-  <comment>@Invariant</comment></data>
-  <data name="tsmiThumbnailSize150.Size" type="System.Drawing.Size, System.Drawing">
+  </data>
+  <data name="tsmiMaxImageLimit0.Size" type="System.Drawing.Size, System.Drawing">
     <value>152, 22</value>
   </data>
   <data name="tsmiThumbnailSize150.Text" xml:space="preserve">
     <value>150 x 150</value>
-  <comment>@Invariant</comment></data>
-  <data name="tsmiThumbnailSize200.Size" type="System.Drawing.Size, System.Drawing">
-    <value>152, 22</value>
   </data>
-  <data name="tsmiThumbnailSize200.Text" xml:space="preserve">
-    <value>200 x 200</value>
-  <comment>@Invariant</comment></data>
-  <data name="tsmiThumbnailSize250.Size" type="System.Drawing.Size, System.Drawing">
-    <value>152, 22</value>
+  <data name="tsddbMaxImageLimit.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG
+        YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9
+        0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw
+        bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc
+        VzOOpHI7Jr376Hi9ogHqFIANO0/MmmmbmSmm9a8ze+I4MrNWAdjtoJgWcx+PSzg166yZZ8xM8XvXDix9
+        c4jIqFYAjoriBV9AhEPv1mH/sonogha0afbZMMZz+yreTGyhpusHwtNNCsA5U1zS4BLxzJIfg299qO32
+        Ir7UJtZfftyATqeT+8o2D8JSjQrAJblrncYL7ZJ2+bfaFnC/1S1NjL3diRat7qrO7wLRP3HjWsojBeCo
+        mDEo5mNjuweFGvjWg2EBhCbpkW78htSHHwRyNdmgAFzPEee2iFkzayy2OLXzT4gr6UdUnlXrullsxxQ+
+        kx0g8BTA3aZlButjSTyjODq/WcQcW/B/Je4OQhLvKQDnzN1mp0nnkvAhR8VuMzNrpm1mpjgkoVwB/v8D
+        TgDQASA1MVpwzwAAAABJRU5ErkJggg==
+</value>
   </data>
-  <data name="tsmiThumbnailSize250.Text" xml:space="preserve">
-    <value>250 x 250</value>
-  <comment>@Invariant</comment></data>
-  <data name="tsddbThumbnailSize.Size" type="System.Drawing.Size, System.Drawing">
-    <value>100, 20</value>
+  <data name="tsddbMaxImageLimit.ImageTransparentColor" type="System.Drawing.Color, System.Drawing">
+    <value>Magenta</value>
+  </data>
+  <data name="tsddbMaxImageLimit.Size" type="System.Drawing.Size, System.Drawing">
+    <value>114, 20</value>
+  </data>
+  <data name="tsmiMaxImageLimit100.Text" xml:space="preserve">
+    <value>Last 100</value>
   </data>
   <data name="tsddbThumbnailSize.Text" xml:space="preserve">
     <value>Thumbnail size</value>
   </data>
-  <data name="tsbQuickList.Size" type="System.Drawing.Size, System.Drawing">
-    <value>150, 20</value>
+  <data name="tsmiThumbnailSize250.Text" xml:space="preserve">
+    <value>250 x 250</value>
   </data>
-  <data name="tsbQuickList.Text" xml:space="preserve">
-    <value>Only show last 100 images</value>
+  <data name="tsmiThumbnailSize200.Text" xml:space="preserve">
+    <value>200 x 200</value>
   </data>
   <data name="tsMain.Location" type="System.Drawing.Point, System.Drawing">
     <value>3, 0</value>
@@ -286,7 +328,7 @@
     <value>3, 1, 3, 1</value>
   </data>
   <data name="tsMain.Size" type="System.Drawing.Size, System.Drawing">
-    <value>347, 25</value>
+    <value>337, 25</value>
   </data>
   <data name="tsMain.TabIndex" type="System.Int32, mscorlib">
     <value>0</value>
@@ -402,11 +444,35 @@
   <data name="&gt;&gt;tsmiThumbnailSize250.Type" xml:space="preserve">
     <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
-  <data name="&gt;&gt;tsbQuickList.Name" xml:space="preserve">
-    <value>tsbQuickList</value>
+  <data name="&gt;&gt;tsddbMaxImageLimit.Name" xml:space="preserve">
+    <value>tsddbMaxImageLimit</value>
   </data>
-  <data name="&gt;&gt;tsbQuickList.Type" xml:space="preserve">
-    <value>System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  <data name="&gt;&gt;tsddbMaxImageLimit.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ToolStripDropDownButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;tsmiMaxImageLimit0.Name" xml:space="preserve">
+    <value>tsmiMaxImageLimit0</value>
+  </data>
+  <data name="&gt;&gt;tsmiMaxImageLimit0.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;tsmiMaxImageLimit100.Name" xml:space="preserve">
+    <value>tsmiMaxImageLimit100</value>
+  </data>
+  <data name="&gt;&gt;tsmiMaxImageLimit100.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;tsmiMaxImageLimit250.Name" xml:space="preserve">
+    <value>tsmiMaxImageLimit250</value>
+  </data>
+  <data name="&gt;&gt;tsmiMaxImageLimit250.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;tsmiMaxImageLimit1000.Name" xml:space="preserve">
+    <value>tsmiMaxImageLimit1000</value>
+  </data>
+  <data name="&gt;&gt;tsmiMaxImageLimit1000.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="&gt;&gt;$this.Name" xml:space="preserve">
     <value>ImageHistoryForm</value>
diff --git a/ShareX.HistoryLib/ImageHistoryForm.ru.resx b/ShareX.HistoryLib/ImageHistoryForm.ru.resx
index 44a15e8c9..7c7966649 100644
--- a/ShareX.HistoryLib/ImageHistoryForm.ru.resx
+++ b/ShareX.HistoryLib/ImageHistoryForm.ru.resx
@@ -123,14 +123,14 @@
   <data name="tsbQuickList.Text" xml:space="preserve">
     <value>Только последние 100</value>
   </data>
-  <data name="tsddbThumbnailSize.Text" xml:space="preserve">
-    <value>Размер миниатюры</value>
+  <data name="tsmiViewModeGallery.Text" xml:space="preserve">
+    <value>Галерея</value>
   </data>
   <data name="tsddbViewMode.Text" xml:space="preserve">
     <value>Режим просмотра</value>
   </data>
-  <data name="tsmiViewModeGallery.Text" xml:space="preserve">
-    <value>Галерея</value>
+  <data name="tsddbThumbnailSize.Text" xml:space="preserve">
+    <value>Размер миниатюры</value>
   </data>
   <data name="tsmiViewModePane.Text" xml:space="preserve">
     <value>Панель</value>
diff --git a/ShareX.HistoryLib/ImageHistoryForm.tr.resx b/ShareX.HistoryLib/ImageHistoryForm.tr.resx
index 0ed2595e6..41f74596c 100644
--- a/ShareX.HistoryLib/ImageHistoryForm.tr.resx
+++ b/ShareX.HistoryLib/ImageHistoryForm.tr.resx
@@ -123,19 +123,19 @@
   <data name="tsbQuickList.Text" xml:space="preserve">
     <value>Sadece son 100 resimi göster</value>
   </data>
-  <data name="tsddbThumbnailSize.Text" xml:space="preserve">
-    <value>Küçük resim boyutu</value>
+  <data name="tsmiViewModeGallery.Text" xml:space="preserve">
+    <value>Galeri</value>
   </data>
   <data name="tsddbViewMode.Text" xml:space="preserve">
     <value>Gösterim modu</value>
   </data>
-  <data name="tsmiViewModeGallery.Text" xml:space="preserve">
-    <value>Galeri</value>
-  </data>
-  <data name="tsmiViewModeThumbnails.Text" xml:space="preserve">
-    <value>Küçük resimler</value>
+  <data name="tsddbThumbnailSize.Text" xml:space="preserve">
+    <value>Küçük resim boyutu</value>
   </data>
   <data name="tsmiViewModePane.Text" xml:space="preserve">
     <value>Yarı pencere</value>
   </data>
+  <data name="tsmiViewModeThumbnails.Text" xml:space="preserve">
+    <value>Küçük resimler</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/ShareX.HistoryLib/ImageHistoryForm.vi-VN.resx b/ShareX.HistoryLib/ImageHistoryForm.vi-VN.resx
index f477bb46e..c037d206d 100644
--- a/ShareX.HistoryLib/ImageHistoryForm.vi-VN.resx
+++ b/ShareX.HistoryLib/ImageHistoryForm.vi-VN.resx
@@ -123,14 +123,14 @@
   <data name="tsbQuickList.Text" xml:space="preserve">
     <value>Chỉ hiện 100 ảnh gần đây nhất</value>
   </data>
-  <data name="tsddbThumbnailSize.Text" xml:space="preserve">
-    <value>Kích thước nhỏ</value>
+  <data name="tsmiViewModeGallery.Text" xml:space="preserve">
+    <value>Thư viện</value>
   </data>
   <data name="tsddbViewMode.Text" xml:space="preserve">
     <value>Chế độ xem</value>
   </data>
-  <data name="tsmiViewModeGallery.Text" xml:space="preserve">
-    <value>Thư viện</value>
+  <data name="tsddbThumbnailSize.Text" xml:space="preserve">
+    <value>Kích thước nhỏ</value>
   </data>
   <data name="tsmiViewModePane.Text" xml:space="preserve">
     <value>Khung</value>
diff --git a/ShareX.HistoryLib/ImageHistoryForm.zh-CN.resx b/ShareX.HistoryLib/ImageHistoryForm.zh-CN.resx
index 74643ab99..b6bb01f6e 100644
--- a/ShareX.HistoryLib/ImageHistoryForm.zh-CN.resx
+++ b/ShareX.HistoryLib/ImageHistoryForm.zh-CN.resx
@@ -123,14 +123,14 @@
   <data name="tsbQuickList.Text" xml:space="preserve">
     <value>只显示最近100张</value>
   </data>
-  <data name="tsddbThumbnailSize.Text" xml:space="preserve">
-    <value>缩略图大小</value>
+  <data name="tsmiViewModeGallery.Text" xml:space="preserve">
+    <value>图库</value>
   </data>
   <data name="tsddbViewMode.Text" xml:space="preserve">
     <value>视图模式</value>
   </data>
-  <data name="tsmiViewModeGallery.Text" xml:space="preserve">
-    <value>图库</value>
+  <data name="tsddbThumbnailSize.Text" xml:space="preserve">
+    <value>缩略图大小</value>
   </data>
   <data name="tsmiViewModePane.Text" xml:space="preserve">
     <value>窗格</value>
diff --git a/ShareX/ApplicationConfig.cs b/ShareX/ApplicationConfig.cs
index f192c35d9..27301e848 100644
--- a/ShareX/ApplicationConfig.cs
+++ b/ShareX/ApplicationConfig.cs
@@ -128,9 +128,9 @@ public ApplicationConfig()
         public int HistorySplitterDistance = 550;
 
         public WindowState ImageHistoryWindowState = new WindowState();
-        public int ImageHistoryMaxItemCount = 100;
         public int ImageHistoryViewMode = 3;
         public Size ImageHistoryThumbnailSize = new Size(150, 150);
+        public int ImageHistoryMaxItemCount = 250;
 
         #endregion History