diff --git a/src/app/knowledge-bases/knowledge-bases.component.html b/src/app/knowledge-bases/knowledge-bases.component.html
index 038cbd90819e..52bb88bb761c 100644
--- a/src/app/knowledge-bases/knowledge-bases.component.html
+++ b/src/app/knowledge-bases/knowledge-bases.component.html
@@ -237,7 +237,7 @@
                   <!-- ---------------------------------------- -->
                   <div class="add-kb-div">
                     <button id="kb-add-content" class="custom-button add-content" [disabled]="addButtonDisabled"
-                      [matMenuTriggerFor]="menu" aria-label="Actions">
+                      [matMenuTriggerFor]="menu">
                       <span class=""> {{ 'KbPage.Add' | translate }} </span>
                     </button>
                     <mat-menu #menu="matMenu" xPosition="before" class="custom-menu" style="width: 150px;">
diff --git a/src/app/knowledge-bases/modals/knowledge-base-table/knowledge-base-table.component.html b/src/app/knowledge-bases/modals/knowledge-base-table/knowledge-base-table.component.html
index a09b614beaf3..396f2f45f131 100644
--- a/src/app/knowledge-bases/modals/knowledge-base-table/knowledge-base-table.component.html
+++ b/src/app/knowledge-bases/modals/knowledge-base-table/knowledge-base-table.component.html
@@ -59,7 +59,7 @@
         <div class="filters">
             <span class="material-icons-outlined filter-icon">filter_list</span>
             <div class="selector status-selector">
-                <ng-select class="custom-input" editable="false" [clearable]='false' [editable]='false'
+                <ng-select class="custom--input" editable="false" [clearable]='false' [editable]='false'
                     [(ngModel)]='filterStatus' dropdownPosition='bottom'
                     (ngModelChange)="onLoadByFilter($event, 'status')">
                     <!-- <ng-option value=""> {{ 'KbPage.StatusAll' | translate }}</ng-option> -->
@@ -73,7 +73,7 @@
             </div>
 
             <div class="selector type-selector">
-                <ng-select class="custom-input" editable="false" [clearable]='false' [editable]='false'
+                <ng-select class="custom--input" editable="false" [clearable]='false' [editable]='false'
                     [(ngModel)]='filterType' dropdownPosition='bottom' (ngModelChange)="onLoadByFilter($event, 'type')">
                     <ng-option value="">
                         <!-- All types -->
diff --git a/src/app/knowledge-bases/modals/modal-preview-settings/modal-preview-settings.component.html b/src/app/knowledge-bases/modals/modal-preview-settings/modal-preview-settings.component.html
index 386c977afbb9..11008b04c35f 100644
--- a/src/app/knowledge-bases/modals/modal-preview-settings/modal-preview-settings.component.html
+++ b/src/app/knowledge-bases/modals/modal-preview-settings/modal-preview-settings.component.html
@@ -134,8 +134,8 @@ <h1 mat-dialog-title style="margin-bottom: 6px">
 
         <div class="field-box">
             <div class="action-wait-slider">
-                <div class="action-wait-range">10</div>
-                <mat-slider class="wait-slider" thumbLabel step="1" min="10" max="2048" [(ngModel)]="max_tokens"
+                <div class="action-wait-range">{{max_tokens_min}}</div>
+                <mat-slider class="wait-slider" thumbLabel step="1" [min]="max_tokens_min" max="2048" [(ngModel)]="max_tokens"
                     (change)="updateSliderValue($event.value, 'max_tokens')" aria-label="units">
                 </mat-slider>
                 <div class="action-wait-range">2048</div>
diff --git a/src/app/knowledge-bases/modals/modal-preview-settings/modal-preview-settings.component.ts b/src/app/knowledge-bases/modals/modal-preview-settings/modal-preview-settings.component.ts
index bebd5df4ec76..11b76027b952 100644
--- a/src/app/knowledge-bases/modals/modal-preview-settings/modal-preview-settings.component.ts
+++ b/src/app/knowledge-bases/modals/modal-preview-settings/modal-preview-settings.component.ts
@@ -44,6 +44,7 @@ export class ModalPreviewSettingsComponent implements OnInit, OnChanges {
 
   public selectedModel: any // = this.models_list[0].value;
   public max_tokens: number;
+  public max_tokens_min: number;
   public temperature: number; // 0.7
   public topK: number;
   public context: string
@@ -114,7 +115,8 @@ export class ModalPreviewSettingsComponent implements OnInit, OnChanges {
 
 
       this.max_tokens = this.selectedNamespace.preview_settings.max_tokens;
-      // this.logger.log("[MODAL PREVIEW SETTINGS] max_tokens ", this.max_tokens)
+      this.logger.log("[MODAL PREVIEW SETTINGS] max_tokens ", this.max_tokens)
+
 
       this.temperature = this.selectedNamespace.preview_settings.temperature
       // this.logger.log("[MODAL PREVIEW SETTINGS] temperature ", this.temperature)
@@ -140,9 +142,15 @@ export class ModalPreviewSettingsComponent implements OnInit, OnChanges {
       if (!this.selectedNamespace.preview_settings.citations) {
         this.citations = false
         this.selectedNamespace.preview_settings.citations = this.citations
+        this.max_tokens_min = 10
+        this.logger.log("[MODAL PREVIEW SETTINGS] max_tokens_min ", this.max_tokens_min)
       } else {
-        this.citations = this.selectedNamespace.preview_settings.citations
+        this.citations = this.selectedNamespace.preview_settings.citations;
+        this.max_tokens_min = 1024;
+        // this.max_tokens = 1024;
+        // this.selectedNamespace.preview_settings.max_tokens = this.max_tokens
         this.logger.log("[MODAL PREVIEW SETTINGS] citations ", this.citations)
+        this.logger.log("[MODAL PREVIEW SETTINGS] max_tokens_min ", this.max_tokens_min)
       }
 
 
@@ -162,7 +170,6 @@ export class ModalPreviewSettingsComponent implements OnInit, OnChanges {
   }
 
   ngOnInit(): void {
-
     const ai_models = loadTokenMultiplier(this.appConfigService.getConfig().aiModels)
     // this.logger.log("[MODAL PREVIEW SETTINGS] ai_models ", ai_models)
 
@@ -232,8 +239,8 @@ export class ModalPreviewSettingsComponent implements OnInit, OnChanges {
   }
 
   updateSliderValue(value, type) {
-    // this.logger.log("[MODAL PREVIEW SETTINGS] value: ", value);
-    // this.logger.log("[MODAL PREVIEW SETTINGS] type: ", type);
+    this.logger.log("[MODAL PREVIEW SETTINGS] value: ", value);
+    this.logger.log("[MODAL PREVIEW SETTINGS] type: ", type);
     // this.logger.log("[MODAL PREVIEW SETTINGS] wasOpenedFromThePreviewKBModal: ", this.wasOpenedFromThePreviewKBModal);
     if (type === "max_tokens") {
       if (!this.wasOpenedFromThePreviewKBModal) {
@@ -331,8 +338,7 @@ export class ModalPreviewSettingsComponent implements OnInit, OnChanges {
   changeAdvancePrompt(event) {
     this.logger.log("[MODAL PREVIEW SETTINGS] changeAdvancedContext event ", event.target.checked)
     this.advancedPrompt = event.target.checked
-    // advancedPrompt: boolean = false;
-    // citations: boolean = false;
+    
     if (!this.wasOpenedFromThePreviewKBModal) {
       this.selectedNamespace.preview_settings.advancedPrompt = this.advancedPrompt
       this.logger.log("[MODAL PREVIEW SETTINGS] changeAdvancedContext this.selectedNamespace ", this.selectedNamespace)
@@ -342,21 +348,30 @@ export class ModalPreviewSettingsComponent implements OnInit, OnChanges {
     this.kbService.hasChagedAiSettings(this.aiSettingsObject)
 
     if (this.advancedPrompt !== this.selectedNamespace.preview_settings.advancedPrompt) {
-      if (this.hasAlreadyOverrideAdvancedContex !== true) {
+      // if (this.hasAlreadyOverrideAdvancedContex !== true) {
         this.countOfOverrides = this.countOfOverrides + 1;
-      }
+      // }
       this.hasAlreadyOverrideAdvancedContex = true
-    } else {
+    } else if (this.advancedPrompt !== this.selectedNamespace.preview_settings.advancedPrompt) {
       this.countOfOverrides = this.countOfOverrides - 1;
+      this.hasAlreadyOverrideAdvancedContex = false
     }
 
   }
 
   changeCitations(event) {
     this.logger.log("[MODAL PREVIEW SETTINGS] changeCitations event ", event.target.checked)
-    this.citations = event.target.checked
-    // advancedPrompt: boolean = false;
-    // citations: boolean = false;
+    this.citations = event.target.checked;
+     if (this.citations === true) {
+      this.max_tokens_min = 1024
+      this.max_tokens = 1024
+       this.selectedNamespace.preview_settings.max_tokens = this.max_tokens
+     } else {
+      this.max_tokens_min = 10;
+      this.max_tokens = 256
+      this.selectedNamespace.preview_settings.max_tokens = this.max_tokens 
+     }
+    
 
     if (!this.wasOpenedFromThePreviewKBModal) {
       this.selectedNamespace.preview_settings.citations = this.citations
@@ -366,15 +381,31 @@ export class ModalPreviewSettingsComponent implements OnInit, OnChanges {
     this.aiSettingsObject[0].citations = this.citations;
     this.kbService.hasChagedAiSettings(this.aiSettingsObject)
 
-    if (this.citations !== this.selectedNamespace.preview_settings.advancedPrompt) {
-      if (this.hasAlreadyOverrideCitations !== true) {
+    // if (this.citations !== this.selectedNamespace.preview_settings.citations) {
+    //   if (this.hasAlreadyOverrideCitations !== true) {
+    //     this.countOfOverrides = this.countOfOverrides + 1;
+    //   }
+    //   this.hasAlreadyOverrideCitations = true
+    //   this.logger.log('hasAlreadyOverrideCitations ' , this.hasAlreadyOverrideCitations) 
+    // } else {
+    //   this.logger.log('here y hasAlreadyOverrideCitations' , this.hasAlreadyOverrideCitations) 
+    //   this.countOfOverrides = this.countOfOverrides - 1;
+    // }
+
+    if (this.citations !== this.selectedNamespace.preview_settings.citations) {
+      // if (this.hasAlreadyOverrideCitations !== true) {
         this.countOfOverrides = this.countOfOverrides + 1;
-      }
+      // }
       this.hasAlreadyOverrideCitations = true
-    } else {
+      this.logger.log('hasAlreadyOverrideCitations ' , this.hasAlreadyOverrideCitations) 
+    } else if (this.citations === this.selectedNamespace.preview_settings.citations)  {
+      this.hasAlreadyOverrideCitations = false
+      this.logger.log('here y hasAlreadyOverrideCitations' , this.hasAlreadyOverrideCitations) 
       this.countOfOverrides = this.countOfOverrides - 1;
     }
 
+
+
   }
 
   onSavePreviewSettings() {
@@ -419,6 +450,12 @@ export class ModalPreviewSettingsComponent implements OnInit, OnChanges {
     this.advancedPrompt = this.selectedNamespaceClone.preview_settings.advancedPrompt
 
     this.citations = this.selectedNamespaceClone.preview_settings.citations
+    this.logger.log('Reset this.citations ', this.citations) 
+    if (this.citations) {
+      this.max_tokens_min = 1024;
+    } else {
+      this.max_tokens_min = 10;
+    }
     // this.selectedNamespace.preview_settings.context = this.contextDefaultValue;
 
     // this.aiSettingsObject[0].model = this.modelDefaultValue;
diff --git a/src/app/knowledge-bases/modals/modal-site-map/modal-site-map.component.html b/src/app/knowledge-bases/modals/modal-site-map/modal-site-map.component.html
index 9567446fb29e..65bdc7cb2028 100644
--- a/src/app/knowledge-bases/modals/modal-site-map/modal-site-map.component.html
+++ b/src/app/knowledge-bases/modals/modal-site-map/modal-site-map.component.html
@@ -54,7 +54,7 @@ <h1 mat-dialog-title>{{ 'KbPage.TitleSitemap' | translate }} </h1>
                             {{'KbPage.IndexingType' | translate}}
                         </span>
                        
-                        <ng-select class="custom-ng-select" style="min-width: 200px; margin-bottom: 6px;" 
+                        <ng-select class="scrape-types-select" style="min-width: 200px; margin-bottom: 6px;" 
                             appendTo="body" 
                             [items]="scrape_types | selectOptionsTranslate" 
                             bindLabel="name" 
diff --git a/src/app/knowledge-bases/modals/modal-site-map/modal-site-map.component.scss b/src/app/knowledge-bases/modals/modal-site-map/modal-site-map.component.scss
index 2a4a2bcd4cc0..5c31c668bf1b 100644
--- a/src/app/knowledge-bases/modals/modal-site-map/modal-site-map.component.scss
+++ b/src/app/knowledge-bases/modals/modal-site-map/modal-site-map.component.scss
@@ -318,10 +318,10 @@ mat-expansion-panel ::ng-deep {
     }
 }
 
-::ng-deep.ng-select-container {
-    height: 48px !important;
-    margin-top: 3px;
-    border-radius: 6px;
+::ng-deep.ng-select.scrape-types-select .ng-select-container {
+    // height: 48px !important;
+    margin-top: 4px;
+    border-radius: 5px;
     border: solid 1px #e4e4e4 !important;
     box-shadow: none;
  }
diff --git a/src/app/knowledge-bases/modals/modal-urls-knowledge-base/modal-urls-knowledge-base.component.html b/src/app/knowledge-bases/modals/modal-urls-knowledge-base/modal-urls-knowledge-base.component.html
index d54fccfb3b11..ec6be58b90a0 100644
--- a/src/app/knowledge-bases/modals/modal-urls-knowledge-base/modal-urls-knowledge-base.component.html
+++ b/src/app/knowledge-bases/modals/modal-urls-knowledge-base/modal-urls-knowledge-base.component.html
@@ -24,7 +24,7 @@ <h1 mat-dialog-title style="font-family: 'Poppins';">  {{ 'KbPage.titleUrls' | t
                             {{'KbPage.IndexingType' | translate}}
                         </span>
                        
-                        <ng-select class="custom-ng-select" style="min-width: 200px; margin-bottom: 6px;" 
+                        <ng-select class="scrape-types-select" style="min-width: 200px; margin-bottom: 6px;" 
                             appendTo="body" 
                             [items]="scrape_types | selectOptionsTranslate" bindLabel="name" bindValue="value"
                             placeholder="{{ 'KbPage.PlaceholderSelectEngine' | translate }}" 
diff --git a/src/app/knowledge-bases/modals/modal-urls-knowledge-base/modal-urls-knowledge-base.component.scss b/src/app/knowledge-bases/modals/modal-urls-knowledge-base/modal-urls-knowledge-base.component.scss
index d2f9d026a746..66bb157259ee 100644
--- a/src/app/knowledge-bases/modals/modal-urls-knowledge-base/modal-urls-knowledge-base.component.scss
+++ b/src/app/knowledge-bases/modals/modal-urls-knowledge-base/modal-urls-knowledge-base.component.scss
@@ -319,10 +319,10 @@ mat-expansion-panel ::ng-deep {
     }
 }
 
-::ng-deep.ng-select-container {
-    height: 48px !important;
-    margin-top: 3px;
-    border-radius: 6px;
+::ng-deep.ng-select.scrape-types-select .ng-select-container {
+    // height: 48px !important;
+    margin-top: 4px;
+    border-radius: 5px;
     border: solid 1px #e4e4e4 !important;
     box-shadow: none;
  }
diff --git a/src/assets/css/demo.scss b/src/assets/css/demo.scss
index a1b25a095618..c4c2c2570ccf 100755
--- a/src/assets/css/demo.scss
+++ b/src/assets/css/demo.scss
@@ -1831,6 +1831,17 @@ footer ul {
   border: none;
 }
 
+.ng-select.custom--input .ng-select-container  {
+  box-shadow: 0 0 4px #c7c7c7 !important;
+  border: unset !important;
+  border-radius: 12px !important;
+} 
+
+.ng-select-container {
+    height: 36px !important;
+}
+
+
 .ng-select.ng-select-tags .ng-dropdown-panel.ng-select-bottom {
   margin-top: 0px !important;
   margin-left: 0px !important;
@@ -1850,6 +1861,11 @@ footer ul {
   outline: 1px solid $icon-color;
 }
 
+// Used 
+.mat-form-field-appearance-outline .mat-form-field-infix {
+  padding: 4.64px 0px 10px 0px !important;
+}
+
 // ::ng-deep
 .cds-mat-tooltip {
   // background-color: #fff !important;