diff --git a/BeWo/AI/Controls/Icon_KI_Chat_Weiss_TEMP.png b/BeWo/AI/Controls/Icon_KI_Chat_Weiss_TEMP.png
deleted file mode 100644
index 5bdf51d2f..000000000
Binary files a/BeWo/AI/Controls/Icon_KI_Chat_Weiss_TEMP.png and /dev/null differ
diff --git a/BeWo/AI/Controls/VoiceToTextButtonControl.xaml b/BeWo/AI/Controls/VoiceToTextButtonControl.xaml
index f27da309c..0b3e6948e 100644
--- a/BeWo/AI/Controls/VoiceToTextButtonControl.xaml
+++ b/BeWo/AI/Controls/VoiceToTextButtonControl.xaml
@@ -8,7 +8,7 @@
         </Grid.RowDefinitions>
         <Button x:Name="ButtonOpenTranskriptionView" Click="ButtonOpenTranskriptionView_Click">
 
-            <Image Source="Icon_KI_Chat_Weiss_TEMP.png"
+            <Image Source="/BeWoPlaner;component/Ressources/Icons/KI/Icon_KI_Chat_Weiss+Orange.png"
                Width="22"
                Height="22"
                Margin="0,0,0,0"/>
diff --git a/BeWo/AI/Controls/VoiceToTextButtonControl.xaml.cs b/BeWo/AI/Controls/VoiceToTextButtonControl.xaml.cs
index a0262092b..bb5f36758 100644
--- a/BeWo/AI/Controls/VoiceToTextButtonControl.xaml.cs
+++ b/BeWo/AI/Controls/VoiceToTextButtonControl.xaml.cs
@@ -49,7 +49,7 @@ namespace BeWo.AI.Controls
         {
             get
             {
-                if (!BeWoApp.AppSettings.ShowAIVoice || String.IsNullOrEmpty(BeWoApp.LoggedOnEmployeeOwnChatCode))
+                if (!BeWoApp.AppSettings.ShowAIVoice || String.IsNullOrEmpty(BeWoApp.LoggedOnEmployeeOwnChatCode) || !BeWoApp.HasLoggedOnUserRight(BS.Shared.UserRightType.AiVoiceView))
                 {
                     return false;
                 }
diff --git a/BeWo/AI/View/AiTranskriptionView.xaml b/BeWo/AI/View/AiTranskriptionView.xaml
index bf2aea87c..fc34f9790 100644
--- a/BeWo/AI/View/AiTranskriptionView.xaml
+++ b/BeWo/AI/View/AiTranskriptionView.xaml
@@ -44,7 +44,7 @@
                         <ColumnDefinition Width="120"/>
                         <ColumnDefinition Width="Auto"/>
                     </Grid.ColumnDefinitions>
-                    <Image Source="Icon_KI_Chat_Weiss_TEMP.png"
+                    <Image Source="/BeWoPlaner;component/Ressources/Icons/KI/Icon_KI_Chat_Weiss+Orange.png"
                Width="32"
                Height="32"
                Margin="0,0,10,0"/>
@@ -182,7 +182,28 @@
                 </Ellipse>
 
             </StackPanel>
+            <StackPanel
+            x:Name="PanelAiButtons"
+            HorizontalAlignment="Right"
+            Orientation="Horizontal"
+                Visibility="Collapsed">
+                <StackPanel.Resources>
+                    <ResourceDictionary>
+                        <ResourceDictionary.MergedDictionaries>
+                            <ResourceDictionary Source="/BeWoPlaner;component/Styles/ModernOrangeBlack.xaml" />
+                        </ResourceDictionary.MergedDictionaries>
+                    </ResourceDictionary>
+                </StackPanel.Resources>
+
+                <Button
+                x:Name="btn_AiPromptbaustein"
+                Padding="0"
+                Command="{Binding OpenAiPromptSelectionCommand}"
+                Content="{StaticResource AiDesignsIconKIFunktionWeissGruen}"
+                Style="{StaticResource PrimaryButton}" />
+            </StackPanel>
         </StackPanel>
+        
         <TextBox
             Style="{x:Null}"
                         x:Name="TextBoxErgebnis"
diff --git a/BeWo/AI/View/AiTranskriptionView.xaml.cs b/BeWo/AI/View/AiTranskriptionView.xaml.cs
index 82664f75b..b12409a8d 100644
--- a/BeWo/AI/View/AiTranskriptionView.xaml.cs
+++ b/BeWo/AI/View/AiTranskriptionView.xaml.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.ComponentModel;
 using System.IO;
 using System.Linq;
+using System.Text;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Forms;
@@ -16,12 +17,14 @@ using BeWo.View;
 using BeWo.View.Controls;
 using BeWo.ViewModel;
 using BeWo.ViewModel.ListViewModel;
-
+using BeWo.ViewModel.View.AI;
 using BS.Shared;
 using BS.Shared.Core;
 using BS.Shared.DataContracts;
+using BS.Shared.DataContracts.Feature.AI.Functions.ServiceRecords;
 using BS.Shared.Extensions;
 using BS.Shared.Translation;
+using DevExpress.Mvvm;
 using DevExpress.Utils;
 using DevExpress.Xpf.Editors;
 using DevExpress.Xpf.Grid;
@@ -37,13 +40,134 @@ namespace BeWo.AI.View
         
         bool timerActive = false;
         AiVoiceDataDC currentVoiceData = null;
+        public ICommand OpenAiPromptSelectionCommand { get; set; }
 
         public AiTranskriptionView()
         {
             InitializeComponent();
-            
+            //InitAiPrompt();
+
         }
-        
+
+        //private void InitAiPrompt()
+        //{
+        //    var vm_doku = new AiPromptbausteinSelectionComplexViewModel(AiActionType.ServiceRecordDocumentation);
+
+        //    vm_doku.PromptAccepted += PromptAccepted;
+
+        //    OpenAiPromptSelectionCommand = new DelegateCommand(() =>
+        //    {
+        //        BeWoApp.MainControl.WindowService.Show(vm_doku);
+        //    }, () => !string.IsNullOrWhiteSpace(TextBoxErgebnis.Text));
+        //}
+
+        //private void PromptAccepted(object sender, AiPromptbausteinPromptVM prompt)
+        //{
+        //    if (prompt is null)
+        //        throw new NotImplementedException();
+
+        //    // 1. Information aufbereiten
+        //    // 1.1 Prompt
+        //    var prompt_oid = prompt.DataContract.Oid.Value;
+        //    var prompt_version = prompt.DataContract.Version;
+
+        //    // 1.2 Hilfeplan
+        //    var support_concept = SelectedCustomerNode.SupportConceptTreeNodeDC.SupportConcept;
+        //    var support_concept_oid = support_concept.SupportConceptOid;
+        //    var support_concept_version = support_concept.SupportConceptVersion;
+
+        //    // 1.3 Aktuelles Doku Feld
+        //    var doku_feld = TextBoxErgebnis.Text;
+
+        //    // 1.4 Sichtbaren Zeiterfassungseinträge
+        //    var service_records = CurrentVisibleVMs;
+        //    var sr_refs = service_records.Select(x => new BeWoRefDC(x.DataContract.ServiceRecordOid.Value, x.DataContract.ServiceRecordVersion));
+
+        //    // 1.5 Costbearer
+        //    var costbearer = SelectedCustomerNode.SupportConceptTreeNodeDC.CostBearer;
+        //    var cb_oid = costbearer.CostBearerOid.Value;
+        //    var cb_ver = costbearer.CostBearerVersion;
+
+        //    // Service Aufruf
+        //    var req = new AiFunctionDocRequest()
+        //    {
+        //        AiPromptbausteinPrompt = new BeWoRefDC(prompt_oid, prompt_version),
+        //        SupportConcept = new BeWoRefDC(support_concept_oid, support_concept_version),
+        //        ServiceRecords = sr_refs,
+        //        CostBearer = new BeWoRefDC(cb_oid, cb_ver),
+        //        Dokumentation = doku_feld,
+        //    };
+
+        //    ServiceFacade.DoAiEnhancedServiceAsnyc(x => x.ExecuteAiFunctionServiceRecordDocumentation(req),
+        //        callback =>
+        //        {
+        //            var viewModel = new AiPromptbausteinActionResultViewModel();
+
+        //            viewModel.Result = callback.Result;
+
+        //            viewModel.Accept_Button_Clicked += (s, e) =>
+        //            {
+        //                var sb = new StringBuilder();
+
+        //                sb.AppendLine("AI Antwort:");
+        //                sb.AppendLine(viewModel.Result);
+
+        //                sb.AppendLine();
+        //                sb.AppendLine("Original:");
+        //                sb.AppendLine(AktuellerDokutext);
+
+        //                var str = sb.ToString();
+        //                var idx = _AiActionHistoryIndex;
+        //                var count = _AiActionHistory.Count;
+
+        //                if (count - 1 > idx)
+        //                {
+        //                    _AiActionHistory.RemoveRange(idx + 1, count - idx - 1);
+        //                }
+
+        //                if (AktuellerDokutext != _AiActionHistory[_AiActionHistoryIndex])
+        //                {
+        //                    _AiActionHistory.Add(AktuellerDokutext);
+        //                    _AiActionHistoryIndex++;
+        //                }
+
+        //                _AiActionHistory.Add(str);
+        //                _AiActionHistoryIndex++;
+
+        //                AktuellerDokutext = str;
+        //            };
+        //            viewModel.Replace_Button_Clicked += (s, e) =>
+        //            {
+        //                var str = viewModel.Result;
+        //                var idx = _AiActionHistoryIndex;
+        //                var count = _AiActionHistory.Count;
+
+        //                if (count - 1 > idx)
+        //                {
+        //                    _AiActionHistory.RemoveRange(idx + 1, count - idx - 1);
+        //                }
+
+        //                if (AktuellerDokutext != _AiActionHistory[_AiActionHistoryIndex])
+        //                {
+        //                    _AiActionHistory.Add(AktuellerDokutext);
+        //                    _AiActionHistoryIndex++;
+        //                }
+
+        //                _AiActionHistory.Add(str);
+        //                _AiActionHistoryIndex++;
+
+        //                AktuellerDokutext = str;
+        //            };
+        //            viewModel.Retry_Button_Clicked += (s, e) =>
+        //            {
+        //                PromptAccepted(sender, prompt);
+        //            };
+
+        //            BeWoApp.MainControl.WindowService.Show(viewModel);
+        //        }
+        //    );
+        //}
+
         public void InitView()
         {
         }
diff --git a/BeWo/AI/View/Icon_KI_Chat_Weiss_TEMP.png b/BeWo/AI/View/Icon_KI_Chat_Weiss_TEMP.png
deleted file mode 100644
index 5bdf51d2f..000000000
Binary files a/BeWo/AI/View/Icon_KI_Chat_Weiss_TEMP.png and /dev/null differ
diff --git a/BeWo/BeWo.csproj b/BeWo/BeWo.csproj
index cc99f0d05..3b604fefb 100644
--- a/BeWo/BeWo.csproj
+++ b/BeWo/BeWo.csproj
@@ -20,7 +20,7 @@
     <ManifestKeyFile>
     </ManifestKeyFile>
     <ManifestCertificateThumbprint>8E3A8E81F1C6F67A1C6D239593544EA33D8AC6A7</ManifestCertificateThumbprint>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <IsWebBootstrapper>true</IsWebBootstrapper>
     <SignAssembly>false</SignAssembly>
     <ExpressionBlendVersion>3.0.1927.0</ExpressionBlendVersion>
     <TargetFrameworkProfile>
@@ -29,25 +29,26 @@
     </FileUpgradeFlags>
     <OldToolsVersion>3.5</OldToolsVersion>
     <UpgradeBackupLocation />
-    <PublishUrl>C:\publish\bewoplaner\</PublishUrl>
+    <PublishUrl>D:\Projects\beyondsoft\BeWoPlaner\Publish\</PublishUrl>
     <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
+    <InstallFrom>Web</InstallFrom>
+    <UpdateEnabled>true</UpdateEnabled>
     <UpdateMode>Foreground</UpdateMode>
     <UpdateInterval>7</UpdateInterval>
     <UpdateIntervalUnits>Days</UpdateIntervalUnits>
     <UpdatePeriodically>false</UpdatePeriodically>
     <UpdateRequired>true</UpdateRequired>
     <MapFileExtensions>false</MapFileExtensions>
+    <InstallUrl>https://app.ownsoft.de/</InstallUrl>
     <TargetCulture>de-DE</TargetCulture>
     <ProductName>BeWoPlaner</ProductName>
     <PublisherName>ownSoft GmbH</PublisherName>
-    <MinimumRequiredVersion>2.0.1.284</MinimumRequiredVersion>
+    <MinimumRequiredVersion>2.0.1.290</MinimumRequiredVersion>
     <CreateWebPageOnPublish>true</CreateWebPageOnPublish>
     <WebPage>publish.htm</WebPage>
     <OpenBrowserOnPublish>false</OpenBrowserOnPublish>
     <TrustUrlParameters>true</TrustUrlParameters>
-    <ApplicationRevision>285</ApplicationRevision>
+    <ApplicationRevision>291</ApplicationRevision>
     <ApplicationVersion>2.0.1.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <CreateDesktopShortcut>true</CreateDesktopShortcut>
@@ -3693,10 +3694,6 @@
     <None Include="Scripts\src\SvcUtil.exe" />
   </ItemGroup>
   <ItemGroup>
-    <Resource Include="AI\Controls\Icon_KI_Chat_Weiss_TEMP.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="AI\View\Icon_KI_Chat_Weiss_TEMP.png" />
     <Resource Include="Ressources\Icons\KI\Icon_KI_Chat_Schw+Orange.png" />
     <Resource Include="Ressources\Icons\KI\Icon_KI_Chat_Schw.png" />
     <Resource Include="Ressources\Icons\KI\Icon_KI_Chat_Weiss+Orange.png" />
diff --git a/BeWo/BeWo.csproj.user b/BeWo/BeWo.csproj.user
index 294f666b8..bd1a52461 100644
--- a/BeWo/BeWo.csproj.user
+++ b/BeWo/BeWo.csproj.user
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <PublishUrlHistory>D:\Projects\beyondsoft\BeWoPlaner\Publish\|publish\|D:\Projects\beyondsoft\BeWoPlaner\PublishTest\|D:\Projects\beyondsoft\BeWoPlaner\PublishDev\|D:\Projects\beyondsoft\BeWoPlaner\Publish45\</PublishUrlHistory>
+    <PublishUrlHistory>D:\Projects\beyondsoft\BeWoPlaner\Publish\|C:\publish\bewoplaner\|publish\|D:\Projects\beyondsoft\BeWoPlaner\PublishTest\|D:\Projects\beyondsoft\BeWoPlaner\PublishDev\</PublishUrlHistory>
     <InstallUrlHistory>https://app.ownsoft.de/|https://app.ownsoft.de/test/|https://app.ownsoft.de/dev/|http://app.ownsoft.de/dev/|http://app.beyondsoft.de/dev/</InstallUrlHistory>
     <SupportUrlHistory />
     <UpdateUrlHistory>https://app.ownsoft.de/|https://app.ownsoft.de/bewoplaner.application/</UpdateUrlHistory>
diff --git a/BeWo/BeWoApp.xaml.cs b/BeWo/BeWoApp.xaml.cs
index baad2e065..8fb4a37a4 100644
--- a/BeWo/BeWoApp.xaml.cs
+++ b/BeWo/BeWoApp.xaml.cs
@@ -56,7 +56,7 @@ namespace BeWo
 		public static LoginControl LoginControl;
 		public static MainControl MainControl;
 
-		public static string ShortVersion = "3.29";
+		public static string ShortVersion = "3.30";
 		public static string Version => BeWoAppInfo.BeWoAppVersion.ToString();
 		public static int RenderTier = 0;
 		
@@ -654,8 +654,10 @@ namespace BeWo
 				showHilfeplanBezeichnung = true;
 				AppSettings.AllowStorno = true;
 				AppSettings.AllowXRechnung = true;
-				//AppSettings.ShowAI = true;
-				//AppSettings.ShowAIInternal = true;
+				
+				AppSettings.ShowAI = true;
+				AppSettings.ShowAIVoice = true;
+				
 				AppSettings.ShowWorktime = true;
 				AppSettings.ShowPersehImport = true;
 				AppSettings.ShowWohnhilfe = true;
@@ -778,9 +780,9 @@ namespace BeWo
 					//{
 					//	url += "/service45";
 					//}
-					if (url.IndexOf("/service_ai") < 0)
+					if (url.IndexOf("/service") < 0)
 					{
-						url += "/service_ai";
+						url += "/service";
 					}
 
 					return new Uri(String.Format("https://{0}", url));
diff --git a/BeWo/BeWoAppInfo.cs b/BeWo/BeWoAppInfo.cs
index 160c6dc9e..31c795e35 100644
--- a/BeWo/BeWoAppInfo.cs
+++ b/BeWo/BeWoAppInfo.cs
@@ -14,9 +14,9 @@ namespace BeWo
 		static BeWoAppInfo()
 		{
 			var baseVersion = new Version(BeWoApp.ShortVersion);
-			var stage = BeWoClientReleaseStage.Sandbox;
+			var stage = BeWoClientReleaseStage.Release;
 			var stageVersion = new Version("3.1");
-			var feature = BeWoClientFeature.AI;
+			var feature = BeWoClientFeature.None;
 
 			BeWoAppVersion = new BeWoAppVersion(baseVersion, stage, stageVersion, feature);
 		}
diff --git a/BeWo/View/Detail/Zeiterfassung/ServiceRecordEditView.xaml.cs b/BeWo/View/Detail/Zeiterfassung/ServiceRecordEditView.xaml.cs
index b2bddfa95..80db7de18 100644
--- a/BeWo/View/Detail/Zeiterfassung/ServiceRecordEditView.xaml.cs
+++ b/BeWo/View/Detail/Zeiterfassung/ServiceRecordEditView.xaml.cs
@@ -235,6 +235,11 @@ namespace BeWo.View.Detail.Zeiterfassung
             }
 
             stackpanel_ai.DataContext = ViewModel;
+
+            if (!BeWoApp.AppSettings.ShowAI)
+            {
+                stackpanel_ai.Visibility = Visibility.Collapsed;
+            }
 		}
 
         private static void CheckRecursive(List<SupportConceptGoalDC> goalTree, bool wert)
diff --git a/BeWo/View/Detail/Zeiterfassung/ServiceRecordView2.xaml b/BeWo/View/Detail/Zeiterfassung/ServiceRecordView2.xaml
index 322cdb735..d93be2a81 100644
--- a/BeWo/View/Detail/Zeiterfassung/ServiceRecordView2.xaml
+++ b/BeWo/View/Detail/Zeiterfassung/ServiceRecordView2.xaml
@@ -1687,8 +1687,6 @@
                                                                         Content="A-"
                                                                         IsTabStop="False"
                                                                         TabIndex="999" />
-
-                                                                    <ai1:VoiceToTextButtonControl Margin="3" TargetTextBox="{Binding ElementName=dokumentationsTextBox}"/>
                                                                 </DockPanel>
 
                                                                 <StackPanel
@@ -1724,6 +1722,8 @@
                                                                         Command="{Binding OpenAiPromptSelectionCommand}"
                                                                         Content="{StaticResource AiDesignsIconKIFunktionWeissGruen}"
                                                                         Style="{StaticResource PrimaryButton}" />
+
+                                                                    <ai1:VoiceToTextButtonControl TargetTextBox="{Binding ElementName=dokumentationsTextBox}"/>
                                                                 </StackPanel>
 
                                                                 <Button
@@ -3315,6 +3315,7 @@
                                 <ColumnDefinition Width="auto" />
                             </Grid.ColumnDefinitions>
                             <StackPanel
+                                x:Name="PanelConversationButton"
                                 Margin="0"
                                 VerticalAlignment="Center"
                                 Orientation="Horizontal">
diff --git a/BeWo/View/Detail/Zeiterfassung/ServiceRecordView2.xaml.cs b/BeWo/View/Detail/Zeiterfassung/ServiceRecordView2.xaml.cs
index a82111798..bff114be9 100644
--- a/BeWo/View/Detail/Zeiterfassung/ServiceRecordView2.xaml.cs
+++ b/BeWo/View/Detail/Zeiterfassung/ServiceRecordView2.xaml.cs
@@ -351,6 +351,11 @@ namespace BeWo.View.Detail.Zeiterfassung
 			Func<bool> canExecuteAi = () => ViewModel.IsAiButtonVisible;
 			OpenAiWindowCommand = CommandFactory.GetAiViewCommand(OpenAiWindow, UserRightType.AiModuleView, canExecuteAi);
             OpenAiChatPromptWindowCommand = CommandFactory.GetAiViewCommand(OpenAiChatPromptWindow, UserRightType.AiModuleChatAdd, canExecuteAi);
+
+            if (!BeWoApp.AppSettings.ShowAI)
+            {
+                btn_AiPromptbaustein.Visibility = Visibility.Collapsed;
+            }
 		}
 
 		public ICommand OpenAiWindowCommand { get; set; }
diff --git a/BeWo/View/Master/AdministrationView.xaml b/BeWo/View/Master/AdministrationView.xaml
index 59d5572b0..c44904625 100644
--- a/BeWo/View/Master/AdministrationView.xaml
+++ b/BeWo/View/Master/AdministrationView.xaml
@@ -318,7 +318,7 @@
                                         Header="{markup:Translate Ressource}"
                                         Selected="Tabitem_Selected" />
                                 </dxa:AccordionItem>
-                                <dxa:AccordionItem Foreground="{StaticResource TabItemTextBrush}" Header="{markup:Translate KI Bereich}">
+                                <dxa:AccordionItem Name="TabitemKIBereich" Foreground="{StaticResource TabItemTextBrush}" Header="{markup:Translate KI Bereich}">
                                     <!--<dxa:AccordionItem
                                         Name="TabitemAiPromptbausteine"
                                         Foreground="Black"
diff --git a/BeWo/View/Master/AdministrationView.xaml.cs b/BeWo/View/Master/AdministrationView.xaml.cs
index ab3542dbe..94a147149 100644
--- a/BeWo/View/Master/AdministrationView.xaml.cs
+++ b/BeWo/View/Master/AdministrationView.xaml.cs
@@ -82,9 +82,6 @@ namespace BeWo.View.Master
 			{
 				TabitemSbd.Visibility = Visibility.Collapsed;
 			}
-#if DEBUG
-			TabitemSbd.Visibility = Visibility.Visible;
-#endif
 			if (BeWoApp.AppSettings.ShowDienstplanung)
 			{
 				TabitemDienste.Visibility = Visibility.Visible;
@@ -98,14 +95,21 @@ namespace BeWo.View.Master
 			//    TabitemOwnChatSettings.Visibility = Visibility.Collapsed;
 			//}
 
-#if DEBUG
-			TabitemDienste.Visibility = Visibility.Visible;
-#endif
-
 			if (!BeWoApp.AppSettings.ShowWohnhilfe)
 			{
 				TabitemFalldaten.Visibility = Visibility.Collapsed;
 			}
+			if (!BeWoApp.AppSettings.ShowAI)
+			{
+				TabitemKIBereich.Visibility = Visibility.Collapsed;
+			}
+
+#if DEBUG
+			TabitemSbd.Visibility = Visibility.Visible;
+			TabitemDienste.Visibility = Visibility.Visible;
+			TabitemKIBereich.Visibility = Visibility.Visible;
+#endif
+
 			#endregion
 
 		}
diff --git a/BeWo/ViewModel/ListViewModel/ServiceRecordListVM.cs b/BeWo/ViewModel/ListViewModel/ServiceRecordListVM.cs
index ec3b051e5..2fb563bdf 100644
--- a/BeWo/ViewModel/ListViewModel/ServiceRecordListVM.cs
+++ b/BeWo/ViewModel/ListViewModel/ServiceRecordListVM.cs
@@ -234,7 +234,7 @@ namespace BeWo.ViewModel.ListViewModel
 		}
 		public string AktuellerEditDokutext
 		{
-			get => EditVM.Notice;
+			get => EditVM?.Notice;
 			set
 			{
 				EditVM.Notice = value;
@@ -243,7 +243,7 @@ namespace BeWo.ViewModel.ListViewModel
 			}
 		}
 
-		public bool IsAiButtonVisible => SelectedCustomerNode is object;
+		public bool IsAiButtonVisible => SelectedCustomerNode is object && (BeWoApp.AppSettings.ShowAI || BeWoApp.AppSettings.ShowAIVoice);
 		public bool IsUndoButtonVisible => _AiActionHistoryIndex > 0;
 		public bool IsRedoButtonVisible => _AiActionHistoryIndex < _AiActionHistory.Count - 1;
 
@@ -466,21 +466,31 @@ namespace BeWo.ViewModel.ListViewModel
 
 		public void UpdateViewYearFilter(IEnumerable<ServiceRecordVM> enumerable)
 		{
-			AiConversationButtonState = AiConversationButtonState.Loading;
+			
+			if (BeWoApp.AppSettings.ShowAI)
+			{
+				AiConversationButtonState = AiConversationButtonState.Loading;
+				var context = GetVisibleInformationReferences(enumerable);
+				if (context != null)
+                {
+					var context2 = context.ToDictionary(kv => kv.Key, kv => kv.Value.ToList());
 
-			var context = GetVisibleInformationReferences(enumerable);
-
-			var context2 = context.ToDictionary(kv => kv.Key, kv => kv.Value.ToList());
-
-			ServiceFacade.DoAiEnhancedServiceAsnyc(x => x.CheckContextSize(AiContextType.ServiceRecord, context2, null),
-				isValid =>
-				{
-					if (isValid)
-						AiConversationButtonState = AiConversationButtonState.Normal;
-					else
-						AiConversationButtonState = AiConversationButtonState.Warning;
-				},
-				(exp) => AiConversationButtonState = AiConversationButtonState.Disabled);
+					ServiceFacade.DoAiEnhancedServiceAsnyc(x => x.CheckContextSize(AiContextType.ServiceRecord, context2, null),
+						isValid =>
+						{
+							if (isValid)
+								AiConversationButtonState = AiConversationButtonState.Normal;
+							else
+								AiConversationButtonState = AiConversationButtonState.Warning;
+						},
+						(exp) => AiConversationButtonState = AiConversationButtonState.Disabled);
+				}
+				
+			}
+			else
+            {
+				AiConversationButtonState = AiConversationButtonState.Hidden;
+			}
 		}
 
 		public Dictionary<TableID, long[]> GetVisibleInformationReferences(IEnumerable<ServiceRecordVM> selected_records)
@@ -489,7 +499,7 @@ namespace BeWo.ViewModel.ListViewModel
 			var hello = current?.SupportConceptTreeNodeDC;
 			var sr = ServiceRecordsForSelectedCustomer;
 
-			if (current is null)
+			if (current is null || hello is null)
 				return null;
 
 			var oids = new List<long>();
diff --git a/BeWo/ViewModel/UserGroupVM.cs b/BeWo/ViewModel/UserGroupVM.cs
index ceb82e78b..856a8861e 100644
--- a/BeWo/ViewModel/UserGroupVM.cs
+++ b/BeWo/ViewModel/UserGroupVM.cs
@@ -102,6 +102,7 @@ namespace BeWo.ViewModel
 			{(r) => r == UserRightType.AiChatInZeiterfassung, BeWoApp.AppSettings.ShowAI},
 			{IsAiModuleRight, BeWoApp.AppSettings.ModuleAiEnabled || BeWoApp.AppSettings.ShowAI},
 			{IsAiModuleSettingRight, BeWoApp.AppSettings.ModuleAiSettingsEnabled},
+			{(r) => r == UserRightType.AiVoiceView, BeWoApp.AppSettings.ShowAIVoice},
 		};
 
 		public List<UserRightType> PossibleRights
diff --git a/BeWoPlanerMobil/BeWoPlanerMobil.csproj.user b/BeWoPlanerMobil/BeWoPlanerMobil.csproj.user
index 883ab72a1..8d834ae6c 100644
--- a/BeWoPlanerMobil/BeWoPlanerMobil.csproj.user
+++ b/BeWoPlanerMobil/BeWoPlanerMobil.csproj.user
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <UseIISExpress>false</UseIISExpress>
diff --git a/Data/Security/UserRightHelper.cs b/Data/Security/UserRightHelper.cs
index bda1d21b1..38965b571 100644
--- a/Data/Security/UserRightHelper.cs
+++ b/Data/Security/UserRightHelper.cs
@@ -191,15 +191,9 @@ namespace BeWo.Data.Security
 
 			if (isRightVersion322(r))
 				return "3.22";
-
-			if (isRightVersion324(r))
-				return "3.24";
-
-			if (isRightVersion326(r))
-				return "3.26";
 			if (isRightVersion329(r))
 				return "3.29";
-			if (r == UserRightType.KalenderInAbwesenheitenUebernehmen)
+			if (isRightVersion330(r))
 				return "3.30";
 			return BASE_VERSION;
 		}
@@ -224,19 +218,6 @@ namespace BeWo.Data.Security
 
 		}
 
-		private static bool isRightVersion324(UserRightType r)
-		{
-			return r == UserRightType.AiModuleView
-				|| r == UserRightType.AiModuleChatAdd
-				|| r == UserRightType.AiModuleChatDelete
-				|| r == UserRightType.AiModuleChatEdit;
-		}
-
-		private static bool isRightVersion326(UserRightType r)
-		{
-			return r == UserRightType.AiModuleChatClone
-				|| r == UserRightType.AiModuleViewSetting;
-		}
 
 		private static bool isRightVersion329(UserRightType r)
 		{
@@ -244,13 +225,21 @@ namespace BeWo.Data.Security
 				|| r == UserRightType.Employee_AllowEditOvertimes;
 		}
 
-		private static bool isRightVersion328(UserRightType r)
+		private static bool isRightVersion330(UserRightType r)
 		{
-			return r == UserRightType.AiModulePromptbausteineAdd
+			return r == UserRightType.KalenderInAbwesenheitenUebernehmen
+				|| r == UserRightType.AiModuleView
+				|| r == UserRightType.AiModuleChatClone
+				|| r == UserRightType.AiModuleViewSetting
+				|| r == UserRightType.AiModuleChatAdd
+				|| r == UserRightType.AiModuleChatDelete
+				|| r == UserRightType.AiModuleChatEdit
+				|| r == UserRightType.AiModulePromptbausteineAdd
 				|| r == UserRightType.AiModulePromptbausteineEdit
 				|| r == UserRightType.AiModulePromptbausteineRemove
 				|| r == UserRightType.AiModulePromptbausteineSeeAll
-				|| r == UserRightType.AiModulePromptbausteineView;
+				|| r == UserRightType.AiModulePromptbausteineView
+				|| r == UserRightType.AiVoiceView;
 		}
 	}
 }
diff --git a/Host/Host.csproj.user b/Host/Host.csproj.user
index 8fd09928c..754e7d06b 100644
--- a/Host/Host.csproj.user
+++ b/Host/Host.csproj.user
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
   <PropertyGroup>
     <NameOfLastUsedPublishProfile>C:\Projects\Bewo\BeWo - Main\Host\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
diff --git a/Service/Plugins/PluginLoader.cs b/Service/Plugins/PluginLoader.cs
index 7044d84f5..d6be1e518 100644
--- a/Service/Plugins/PluginLoader.cs
+++ b/Service/Plugins/PluginLoader.cs
@@ -70,7 +70,7 @@ namespace BeWo.Service.Plugins
                 //t = "5351926758"; // Viva a Vida
                 //t = "2215396183"; // Diakonie Remscheid Lennep
                 //t = "5157599087"; // SHG Schwerte
-                //t = "4526293996"; // Fortis
+                t = "4526293996"; // Fortis
                 //t = "3647969417"; // Caritas Bottrop
                 //t = "3057313346"; // SSB Mainz
                 //t = "6246287823"; // BeWo Alsdorf
@@ -85,7 +85,7 @@ namespace BeWo.Service.Plugins
                 //t = "4867997795"; // ADiK Kleve
                 //t = "3184859776"; // Sergej Becker
                 //t = "7752610643"; // BWK Gbr
-                t = "3785623125"; // Betreuwo
+                //t = "3785623125"; // Betreuwo
                 //t = "7130228334"; // LH Borken
                 //t = "4209820830"; // VKM Hamm
                 //t = "5700328131"; // Betreutes Wohnen St. Ludgerus Essen-Werden
@@ -120,7 +120,7 @@ namespace BeWo.Service.Plugins
                 //t = "3536719736"; // BeWo Stefanie Schäfer (BeWoKerpen)
                 //t = "7739670213"; // SPZ Leverkusen
                 //t = "3341456098"; // Hilfe Daheim (früher BeWo Schillinger)
-                t = "4271389563"; // Komm Mit
+                //t = "4271389563"; // Komm Mit
                 //t = "5430005891"; // Marienhospital Eickel
                 //t = "3265049248"; // Gerdas Pflegedienst
                 //t = "1549622397"; // Kontakt und Krisenhilfe
@@ -185,7 +185,7 @@ namespace BeWo.Service.Plugins
                 //t = "5260936181"; // LORI
                 //t = "1931553444"; // HIBA
                 //t = "7185338722"; // BeWo Walz & Paiva
-                t = "3196643272"; // Betreutes Wohnen Lisa Wöll
+                //t = "3196643272"; // Betreutes Wohnen Lisa Wöll
                 //t = "3432911735"; // Caritas Günzburg - Neu Ulm
                 //t = "2591682148"; // Humanitas
                 //t = "9805564204"; // LeWo Aachen
@@ -246,7 +246,7 @@ namespace BeWo.Service.Plugins
                 //t = "2697528233"; // Diakonisches Werk Wesel
                 //t = "2547623489"; // Sprungbrett
                 //t = "5076807716"; // Psychosoziale Hilfen Bochum e.V.
-                t = "1601313225"; // Bella Donna
+                //t = "1601313225"; // Bella Donna
                 //t = "5098825926"; // SAB GmbH
                 //t = "7808149226"; // BeWo Flex
                 //t = "7419804320"; // Gender Bewo
@@ -426,7 +426,7 @@ namespace BeWo.Service.Plugins
                 //t = "6652760522"; // BBI Rhein-Sieg gGmbH
                 //t = "6095094585"; // IBAHS e.V.
                 //t = "9453919144"; // Beratung am Stadtwald - Lisa Maria Reeh
-                t = "5960095273"; // Flexible Jugendarbeit Frankfurt (Oder) e.V.
+                //t = "5960095273"; // Flexible Jugendarbeit Frankfurt (Oder) e.V.
                 return t;
 #else
                 if (MultitenancyOperationContextExt.Current != null)