diff --git a/BeWo/Styles/Features/AIChatStyles.xaml b/BeWo/Styles/Features/AIChatStyles.xaml
index 3c300b20b..1a212100f 100644
--- a/BeWo/Styles/Features/AIChatStyles.xaml
+++ b/BeWo/Styles/Features/AIChatStyles.xaml
@@ -8,6 +8,7 @@
 
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary Source="..\DataTemplates\ControlTemplates.xaml" />
+        <ResourceDictionary Source="..\Designs\GeometryCollection.xaml" />
     </ResourceDictionary.MergedDictionaries>
 
     <Style x:Key="MessageTextBoxStyle" TargetType="{x:Type TextBox}">
@@ -160,8 +161,8 @@
                     <Border
                         x:Name="border"
                         Padding="{TemplateBinding Padding}"
-                        Background="#B2FFFFFF"
-                        BorderBrush="#26000000"
+                        Background="#00000000"
+                        BorderBrush="#00000000"
                         BorderThickness="1"
                         CornerRadius="12">
                         <ContentPresenter
@@ -347,8 +348,15 @@
                         <Button
                             Command="{Binding Command}"
                             CommandParameter="{Binding DataContext, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}"
-                            Content="{Binding Name}"
-                            Style="{StaticResource AssistentCommandButtonStyle}" />
+                            Style="{StaticResource AssistentCommandButtonStyle}" 
+                            ToolTip="{Binding Name}">
+                            <Path
+                    Data="{Binding Icon}"  
+Width="16"
+Height="16"
+Fill="Black" 
+                            Stretch="Fill"/>
+                        </Button>
                     </DataTemplate>
                 </ItemsControl.ItemTemplate>
             </ItemsControl>
@@ -501,8 +509,15 @@
                 HorizontalAlignment="Right"
                 Command="{Binding DataContext.SavePromptCommand, RelativeSource={RelativeSource AncestorType={x:Type ListView}}}"
                 CommandParameter="{Binding}"
-                Content="Speichern"
-                Style="{StaticResource UserMessageSaveButtonStyle}" />
+                ToolTip="Speichern"
+                Style="{StaticResource UserMessageSaveButtonStyle}" >
+                <Path
+                    Data="{StaticResource Phosphor.FloppyDisk}"  
+Width="16"
+Height="16"
+Fill="Black" 
+                            Stretch="Fill"/>
+            </Button>
         </Grid>
     </DataTemplate>
 
diff --git a/BeWo/Styles/OrangeBlack.xaml b/BeWo/Styles/OrangeBlack.xaml
index 4be00468d..1538d22be 100644
--- a/BeWo/Styles/OrangeBlack.xaml
+++ b/BeWo/Styles/OrangeBlack.xaml
@@ -17,6 +17,7 @@
 
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary Source="Colors\Colors.xaml" />
+        <ResourceDictionary Source="Designs\GeometryCollection.xaml" />
     </ResourceDictionary.MergedDictionaries>
 
     <conv:CustomerDCPrintURLConverter x:Key="CustomerDCPrintURLConverter" />
diff --git a/BeWo/ViewModel/Controls/AI/AiChatButtonViewModel.cs b/BeWo/ViewModel/Controls/AI/AiChatButtonViewModel.cs
index daa167432..4a5497ea0 100644
--- a/BeWo/ViewModel/Controls/AI/AiChatButtonViewModel.cs
+++ b/BeWo/ViewModel/Controls/AI/AiChatButtonViewModel.cs
@@ -10,6 +10,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Windows;
 using System.Windows.Input;
+using System.Windows.Media;
 
 namespace BeWo.ViewModel.Controls.AI
 {
@@ -224,8 +225,13 @@ namespace BeWo.ViewModel.Controls.AI
 
 	public class AiMenuItemTemplate
 	{
-		public string Icon { get; set; }
+		public Geometry Icon { get; set; }
 		public string Name { get; set; }
 		public DelegateCommand<AiConversationMessageVM> Command { get; set; }
+
+		public AiMenuItemTemplate()
+		{
+			
+		}
 	}
 }
diff --git a/BeWo/ViewModel/Controls/AI/AiChatButtonWithHistoryViewModel.cs b/BeWo/ViewModel/Controls/AI/AiChatButtonWithHistoryViewModel.cs
index 15440a013..c8aab927e 100644
--- a/BeWo/ViewModel/Controls/AI/AiChatButtonWithHistoryViewModel.cs
+++ b/BeWo/ViewModel/Controls/AI/AiChatButtonWithHistoryViewModel.cs
@@ -7,6 +7,8 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Media;
 
 namespace BeWo.ViewModel.Controls.AI
 {
@@ -54,13 +56,13 @@ namespace BeWo.ViewModel.Controls.AI
 				new AiMenuItemTemplate()
 				{
 					Command = new DelegateCommand<AiConversationMessageVM>(x => AddValue(x.Message)),
-					Icon = null,
+					Icon =  Application.Current.FindResource("Phosphor.RowsPlusTop") as Geometry,
 					Name = "Anfügen"
 				},
 				new AiMenuItemTemplate()
 				{
 					Command = new DelegateCommand<AiConversationMessageVM>(x => ReplaceValue(x.Message)),
-					Icon = null,
+					Icon = Application.Current.FindResource("Phosphor.Swap") as Geometry,
 					Name = "Ersetzen"
 				},
 			};