diff --git a/src/Sitko.Blockly.MudBlazor/Blocks/MudCutBlockDescriptor.cs b/src/Sitko.Blockly.MudBlazor/Blocks/MudCutBlockDescriptor.cs
index f3c126d..6797e48 100644
--- a/src/Sitko.Blockly.MudBlazor/Blocks/MudCutBlockDescriptor.cs
+++ b/src/Sitko.Blockly.MudBlazor/Blocks/MudCutBlockDescriptor.cs
@@ -14,5 +14,5 @@ public MudCutBlockDescriptor(ILocalizationProvider<CutBlock> localizationProvide
     {
     }
 
-    public override RenderFragment Icon => builder => builder.AddIcon(Icons.Filled.ContentCut);
+    public override string Icon => Icons.Filled.ContentCut;
 }
diff --git a/src/Sitko.Blockly.MudBlazor/Blocks/MudFilesBlockDescriptor.cs b/src/Sitko.Blockly.MudBlazor/Blocks/MudFilesBlockDescriptor.cs
index 06a4e81..6c564f3 100644
--- a/src/Sitko.Blockly.MudBlazor/Blocks/MudFilesBlockDescriptor.cs
+++ b/src/Sitko.Blockly.MudBlazor/Blocks/MudFilesBlockDescriptor.cs
@@ -15,5 +15,5 @@ public MudFilesBlockDescriptor(ILocalizationProvider<FilesBlock> localizationPro
     {
     }
 
-    public override RenderFragment Icon => builder => builder.AddIcon(Icons.Filled.Attachment);
+    public override string Icon => Icons.Filled.Attachment;
 }
diff --git a/src/Sitko.Blockly.MudBlazor/Blocks/MudGalleryBlockDescriptor.cs b/src/Sitko.Blockly.MudBlazor/Blocks/MudGalleryBlockDescriptor.cs
index 3ff4562..aa4a299 100644
--- a/src/Sitko.Blockly.MudBlazor/Blocks/MudGalleryBlockDescriptor.cs
+++ b/src/Sitko.Blockly.MudBlazor/Blocks/MudGalleryBlockDescriptor.cs
@@ -16,5 +16,5 @@ public MudGalleryBlockDescriptor(ILocalizationProvider<GalleryBlock> localizatio
     {
     }
 
-    public override RenderFragment Icon => builder => builder.AddIcon(Icons.Filled.Photo);
+    public override string Icon => Icons.Filled.Photo;
 }
diff --git a/src/Sitko.Blockly.MudBlazor/Blocks/MudIframeBlockDescriptor.cs b/src/Sitko.Blockly.MudBlazor/Blocks/MudIframeBlockDescriptor.cs
index a2f5ca1..a93f327 100644
--- a/src/Sitko.Blockly.MudBlazor/Blocks/MudIframeBlockDescriptor.cs
+++ b/src/Sitko.Blockly.MudBlazor/Blocks/MudIframeBlockDescriptor.cs
@@ -16,5 +16,5 @@ public MudIframeBlockDescriptor(ILocalizationProvider<IframeBlock> localizationP
     {
     }
 
-    public override RenderFragment Icon => builder => builder.AddIcon(Icons.Filled.Code);
+    public override string Icon => Icons.Filled.Code;
 }
diff --git a/src/Sitko.Blockly.MudBlazor/Blocks/MudQuoteBlockDescriptor.cs b/src/Sitko.Blockly.MudBlazor/Blocks/MudQuoteBlockDescriptor.cs
index f01f27e..47283c5 100644
--- a/src/Sitko.Blockly.MudBlazor/Blocks/MudQuoteBlockDescriptor.cs
+++ b/src/Sitko.Blockly.MudBlazor/Blocks/MudQuoteBlockDescriptor.cs
@@ -15,5 +15,5 @@ public MudQuoteBlockDescriptor(ILocalizationProvider<QuoteBlock> localizationPro
     {
     }
 
-    public override RenderFragment Icon => builder => builder.AddIcon(Icons.Filled.FormatQuote);
+    public override string Icon => Icons.Filled.FormatQuote;
 }
diff --git a/src/Sitko.Blockly.MudBlazor/Blocks/MudTextBlockDescriptor.cs b/src/Sitko.Blockly.MudBlazor/Blocks/MudTextBlockDescriptor.cs
index de19f11..38d2e69 100644
--- a/src/Sitko.Blockly.MudBlazor/Blocks/MudTextBlockDescriptor.cs
+++ b/src/Sitko.Blockly.MudBlazor/Blocks/MudTextBlockDescriptor.cs
@@ -15,5 +15,5 @@ public MudTextBlockDescriptor(ILocalizationProvider<TextBlock> localizationProvi
     {
     }
 
-    public override RenderFragment Icon => builder => builder.AddIcon(Icons.Filled.TextFields);
+    public override string Icon => Icons.Filled.TextFields;
 }
diff --git a/src/Sitko.Blockly.MudBlazor/Blocks/MudTwitchBlockDescriptor.cs b/src/Sitko.Blockly.MudBlazor/Blocks/MudTwitchBlockDescriptor.cs
index 3c6c136..e431450 100644
--- a/src/Sitko.Blockly.MudBlazor/Blocks/MudTwitchBlockDescriptor.cs
+++ b/src/Sitko.Blockly.MudBlazor/Blocks/MudTwitchBlockDescriptor.cs
@@ -16,5 +16,5 @@ public MudTwitchBlockDescriptor(ILocalizationProvider<TwitchBlock> localizationP
     {
     }
 
-    public override RenderFragment Icon => builder => builder.AddIcon(Icons.Filled.Stream);
+    public override string Icon => Icons.Filled.Stream; // TODO: Get twitch icon
 }
diff --git a/src/Sitko.Blockly.MudBlazor/Blocks/MudTwitterBlockDescriptor.cs b/src/Sitko.Blockly.MudBlazor/Blocks/MudTwitterBlockDescriptor.cs
index f32b3d4..f3ed936 100644
--- a/src/Sitko.Blockly.MudBlazor/Blocks/MudTwitterBlockDescriptor.cs
+++ b/src/Sitko.Blockly.MudBlazor/Blocks/MudTwitterBlockDescriptor.cs
@@ -16,5 +16,5 @@ public MudTwitterBlockDescriptor(ILocalizationProvider<TwitterBlock> localizatio
     {
     }
 
-    public override RenderFragment Icon => builder => builder.AddIcon(Icons.Custom.Brands.Twitter);
+    public override string Icon => Icons.Custom.Brands.Twitter;
 }
diff --git a/src/Sitko.Blockly.MudBlazor/Blocks/MudYoutubeBlockDescriptor.cs b/src/Sitko.Blockly.MudBlazor/Blocks/MudYoutubeBlockDescriptor.cs
index 085c213..dfe8e62 100644
--- a/src/Sitko.Blockly.MudBlazor/Blocks/MudYoutubeBlockDescriptor.cs
+++ b/src/Sitko.Blockly.MudBlazor/Blocks/MudYoutubeBlockDescriptor.cs
@@ -16,5 +16,5 @@ public MudYoutubeBlockDescriptor(ILocalizationProvider<YoutubeBlock> localizatio
     {
     }
 
-    public override RenderFragment Icon => builder => builder.AddIcon(Icons.Custom.Brands.YouTube);
+    public override string Icon => Icons.Custom.Brands.YouTube;
 }
diff --git a/src/Sitko.Blockly.MudBlazor/Forms/MudBlocklyForm.razor b/src/Sitko.Blockly.MudBlazor/Forms/MudBlocklyForm.razor
index 39fa68f..0ce3d91 100644
--- a/src/Sitko.Blockly.MudBlazor/Forms/MudBlocklyForm.razor
+++ b/src/Sitko.Blockly.MudBlazor/Forms/MudBlocklyForm.razor
@@ -27,7 +27,7 @@
                     </div>
                     <div class="block-controls block-controls-default">
                         <div class="block-mainicon" title="@blockDescriptor.Title">
-                            @blockDescriptor.Icon
+                            <MudIcon Icon="@blockDescriptor.Icon"></MudIcon>
                         </div>
                         <span title="@(block.Enabled ? LocalizationProvider["Disable block"] : LocalizationProvider["Enable block"])">
                             <MudButton Size="Size.Medium" OnClick="@(() => block.Enabled = !block.Enabled)" Class="block-disable-button">
@@ -85,7 +85,7 @@
                            foreach (var descriptor in BlockDescriptors)
                            {
                                <span class="add-block-button" title="@descriptor.Title">
-                                   <MudButton Disabled="!CanAdd(descriptor)" Size="@Size.Medium" OnClick="() => AddBlock(descriptor, afterBlock)">@descriptor.Icon</MudButton>
+                                   <MudButton Disabled="!CanAdd(descriptor)" Size="@Size.Medium" OnClick="() => AddBlock(descriptor, afterBlock)" StartIcon="@descriptor.Icon"></MudButton>
                                </span>
                            }
                        }