diff --git a/src/Greenshot.Editor/Controls/EmojiControl.cs b/src/Greenshot.Editor/Controls/EmojiControl.cs
index 7a7989a12..5b317f7a5 100644
--- a/src/Greenshot.Editor/Controls/EmojiControl.cs
+++ b/src/Greenshot.Editor/Controls/EmojiControl.cs
@@ -11,7 +11,7 @@ namespace Greenshot.Editor.Controls
 
         private static void PropertyChangedCallback(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
-            ((EmojiControl)d).Source = EmojiRenderer.GetIcon((string)e.NewValue);
+            ((EmojiControl)d).Source = EmojiRenderer.GetBitmapSource((string)e.NewValue, iconSize: 48);
         }
 
         public string Emoji
diff --git a/src/Greenshot.Editor/Controls/EmojiData.cs b/src/Greenshot.Editor/Controls/EmojiData.cs
index 88e90c6f0..726b17c81 100644
--- a/src/Greenshot.Editor/Controls/EmojiData.cs
+++ b/src/Greenshot.Editor/Controls/EmojiData.cs
@@ -45,12 +45,7 @@ namespace Greenshot.Editor.Controls
 
         public static void Load()
         {
-            _init ??= Task.Run(() =>
-            {
-                ParseEmojiList();
-
-                EmojiRenderer.FillIconCache(AllEmoji.Select(e => e.Text));
-            });
+            _init ??= Task.Run(ParseEmojiList);
         }
 
         public class Emoji
diff --git a/src/Greenshot.Editor/Controls/EmojiPicker.xaml b/src/Greenshot.Editor/Controls/EmojiPicker.xaml
index 3611c67c0..a58856913 100644
--- a/src/Greenshot.Editor/Controls/EmojiPicker.xaml
+++ b/src/Greenshot.Editor/Controls/EmojiPicker.xaml
@@ -89,8 +89,15 @@
                         <ListView Name="EmojiListView" ItemsSource="{Binding EmojiChunkList}"
                                   BorderThickness="0"
                                   MaxHeight="320" Height="Auto" Padding="0" Margin="1"
+                                  VirtualizingStackPanel.IsVirtualizing="True"
+                                  VirtualizingStackPanel.VirtualizationMode="Recycling"
                                   ScrollViewer.VerticalScrollBarVisibility="Visible"
                                   ScrollViewer.HorizontalScrollBarVisibility="Disabled">
+                            <ListView.ItemsPanel>
+                                <ItemsPanelTemplate>
+                                    <VirtualizingStackPanel />
+                                </ItemsPanelTemplate>
+                            </ListView.ItemsPanel>
                             <ListView.ItemContainerStyle>
                                 <Style TargetType="{x:Type ListViewItem}">
                                     <!-- Get rid of the ugly padding and margin in default ListViewItem -->
diff --git a/src/Greenshot.Editor/Drawing/EmojiRenderer.cs b/src/Greenshot.Editor/Drawing/EmojiRenderer.cs
index 471d0055c..3a1713910 100644
--- a/src/Greenshot.Editor/Drawing/EmojiRenderer.cs
+++ b/src/Greenshot.Editor/Drawing/EmojiRenderer.cs
@@ -1,16 +1,12 @@
 using System;
-using System.Collections.Concurrent;
-using System.Collections.Generic;
 using System.Drawing;
 using System.IO;
 using System.Reflection;
-using System.Threading.Tasks;
+using System.Windows.Media;
 using System.Windows.Media.Imaging;
 using SixLabors.Fonts;
 using SixLabors.ImageSharp;
-using SixLabors.ImageSharp.Advanced;
 using SixLabors.ImageSharp.Drawing.Processing;
-using SixLabors.ImageSharp.Formats.Png;
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Processing;
 using Font = SixLabors.Fonts.Font;
@@ -32,8 +28,6 @@ namespace Greenshot.Editor.Drawing
             return fontFamily;
         });
 
-        private static ConcurrentDictionary<string, BitmapSource> _iconCache = new ConcurrentDictionary<string, BitmapSource>();
-
         public static Image<Rgba32> GetImage(string emoji, int iconSize)
         {
             var font = _fontFamily.Value.CreateFont(iconSize, FontStyle.Regular);
@@ -44,7 +38,7 @@ namespace Greenshot.Editor.Drawing
             return image;
         }
 
-        private static void RenderEmoji(string emoji, Font font, Image<Rgba32> image)
+        private static void RenderEmoji(string emoji, Font font, SixLabors.ImageSharp.Image image)
         {
             var verticalOffset = font.Size * 0.045f;
             var textOptions = new TextOptions(font)
@@ -64,8 +58,21 @@ namespace Greenshot.Editor.Drawing
 
         public static BitmapSource GetBitmapSource(string emoji, int iconSize)
         {
-            using var image = GetImage(emoji, iconSize);
-            return image.ToBitmapSource();
+            var pixelFormat = PixelFormats.Bgra32;
+            int width = iconSize;
+            int height = iconSize;
+            int stride = (width * pixelFormat.BitsPerPixel + 7) / 8;
+            byte[] pixels = new byte[stride * height];
+
+            var image = SixLabors.ImageSharp.Image.WrapMemory<Bgra32>(byteMemory: pixels, width: width, height: height);
+
+            var font = _fontFamily.Value.CreateFont(iconSize, FontStyle.Regular);
+            RenderEmoji(emoji, font, image);
+
+            var source = BitmapSource.Create(pixelWidth: width, pixelHeight: height, dpiX: 96, dpiY: 96, pixelFormat: pixelFormat, palette: null, pixels: pixels, stride: stride);
+            source.Freeze();
+
+            return source;
         }
 
         public static Bitmap ToBitmap(this Image<Rgba32> image)
@@ -78,39 +85,5 @@ namespace Greenshot.Editor.Drawing
 
             return new Bitmap(memoryStream);
         }
-
-        public static BitmapSource ToBitmapSource(this Image<Rgba32> image)
-        {
-            using var memoryStream = new MemoryStream();
-
-            image.SaveAsPng(memoryStream);
-
-            memoryStream.Seek(0, SeekOrigin.Begin);
-
-            var bitmap = new BitmapImage();
-            bitmap.BeginInit();
-            bitmap.StreamSource = memoryStream;
-            bitmap.CacheOption = BitmapCacheOption.OnLoad;
-            bitmap.EndInit();
-            bitmap.Freeze();
-
-            return bitmap;
-        }
-
-        public static void FillIconCache(IEnumerable<string> emojis)
-        {
-            var font = _fontFamily.Value.CreateFont(64, FontStyle.Regular);
-            foreach (var emoji in emojis)
-            {
-                using var image = new Image<Rgba32>(64, 64);
-                RenderEmoji(emoji, font, image);
-                _iconCache[emoji] = image.ToBitmapSource();
-            }
-        }
-
-        public static BitmapSource GetIcon(string emoji)
-        {
-            return _iconCache.GetOrAdd(emoji, x => GetBitmapSource(x, 64));
-        }
     }
 }