diff --git a/eform-client/src/app/plugins/modules/backend-configuration-pn/modules/task-wizard/components/task-wizard-actions/task-wizard-create-modal/task-wizard-create-modal.component.html b/eform-client/src/app/plugins/modules/backend-configuration-pn/modules/task-wizard/components/task-wizard-actions/task-wizard-create-modal/task-wizard-create-modal.component.html
index feb49a8e..95c0cdaa 100644
--- a/eform-client/src/app/plugins/modules/backend-configuration-pn/modules/task-wizard/components/task-wizard-actions/task-wizard-create-modal/task-wizard-create-modal.component.html
+++ b/eform-client/src/app/plugins/modules/backend-configuration-pn/modules/task-wizard/components/task-wizard-actions/task-wizard-create-modal/task-wizard-create-modal.component.html
@@ -11,11 +11,11 @@ <h3 mat-dialog-title>{{ 'Create new task' | translate }}</h3>
       {{ 'Status' | translate }}
     </mat-slide-toggle>
     <mat-slide-toggle *ngIf="selectCurrentUserIsAdmin$ | async"
-      class="p-2"
-      color="primary"
-      id="complianceEnabledToggle"
-      formControlName="complianceEnabled"
-      (change)="changeComplianceEnabled($event.checked)"
+                      class="p-2"
+                      color="primary"
+                      id="complianceEnabledToggle"
+                      formControlName="complianceEnabled"
+                      (change)="changeComplianceEnabled($event.checked)"
     >
       {{ 'Compliance' | translate }}
     </mat-slide-toggle>
@@ -46,10 +46,9 @@ <h3 mat-dialog-title>{{ 'Create new task' | translate }}</h3>
           [multiple]="false"
         />
       </mat-form-field>
-      <div class="pt-6">
+      <div class="mt-3">
         <button
-          matSuffix
-          mat-icon-button
+          class="btn-secondary btn-secondary--icon-rounded-border"
           color="primary"
           id="planningManageTagsBtn1"
           (click)="openTagsModal()"
@@ -60,22 +59,13 @@ <h3 mat-dialog-title>{{ 'Create new task' | translate }}</h3>
       </div>
     </div>
 
-    <div class="d-flex flex-row">
-      <div style="width: 450px" class="p-2">
-        <button
-          mat-icon-button
-          color="accent"
-          id="createFolder"
-          (click)="openFoldersModal()"
-          style="margin-left: -10px"
-          [disabled]="!taskForm.value.propertyId"
-          [matTooltip]="(!taskForm.value.propertyId ? 'Need to select property' : 'Select folder') | translate"
-        >
-          <mat-icon>folder</mat-icon>
-        </button>
-        <span>{{ selectedFolderName || ('Folder not selected' | translate) }}</span>
-      </div>
-    </div>
+    <app-folder-tree-select
+      id="createFolder"
+      [nodes]="foldersTreeDto"
+      [selectedNodeId]="taskForm.get('folderId')?.value"
+      (nodeSelected)="onFolderSelected($event)"
+      [disabled]="!taskForm.value.propertyId"
+    ></app-folder-tree-select>
 
     <div class="d-flex flex-row">
       <mat-form-field class="p-2">
@@ -108,11 +98,9 @@ <h3 mat-dialog-title>{{ 'Create new task' | translate }}</h3>
           [multiple]="true"
         />
       </mat-form-field>
-      <div class="pt-6">
+      <div class="mt-3">
         <button
-          matSuffix
-          mat-icon-button
-          color="primary"
+          class="btn-secondary btn-secondary--icon-rounded-border"
           id="planningManageTagsBtn2"
           (click)="openTagsModal()"
           matTooltip="{{ 'Manage tags' | translate }}"
diff --git a/eform-client/src/app/plugins/modules/backend-configuration-pn/modules/task-wizard/components/task-wizard-actions/task-wizard-create-modal/task-wizard-create-modal.component.ts b/eform-client/src/app/plugins/modules/backend-configuration-pn/modules/task-wizard/components/task-wizard-actions/task-wizard-create-modal/task-wizard-create-modal.component.ts
index ec87a2cc..a4d90d86 100644
--- a/eform-client/src/app/plugins/modules/backend-configuration-pn/modules/task-wizard/components/task-wizard-actions/task-wizard-create-modal/task-wizard-create-modal.component.ts
+++ b/eform-client/src/app/plugins/modules/backend-configuration-pn/modules/task-wizard/components/task-wizard-actions/task-wizard-create-modal/task-wizard-create-modal.component.ts
@@ -68,6 +68,7 @@ export class TaskWizardCreateModalComponent implements OnInit, OnDestroy {
   dayOfWeekArr: { id: number, name: string }[] = [];
   taskForm: FormGroup;
   selectedFolderName: string = '';
+  selectedFolderId: number = null;
   appLanguages: LanguagesModel = new LanguagesModel();
   templateRequestModel: TemplateRequestModel = new TemplateRequestModel();
   templatesModel: TemplateListModel = new TemplateListModel();
@@ -100,7 +101,7 @@ export class TaskWizardCreateModalComponent implements OnInit, OnDestroy {
     return TaskWizardStatusesEnum;
   }
 
-  
+
   constructor() {
     this.typeahead
       .pipe(
@@ -266,6 +267,12 @@ export class TaskWizardCreateModalComponent implements OnInit, OnDestroy {
     });
   }
 
+  onFolderSelected(folder: FolderDto) {
+    this.taskForm.patchValue({ folderId: folder.id });
+    this.selectedFolderId = folder.id;
+    this.selectedFolderName = findFullNameById(folder.id, this.foldersTreeDto);
+  }
+
   /*updateLanguageModel(translationsModel: CommonTranslationsModel, index: number) {
       this.model.translates[index] = translationsModel;
     }*/
diff --git a/eform-client/src/app/plugins/modules/backend-configuration-pn/modules/task-wizard/components/task-wizard-actions/task-wizard-update-modal/task-wizard-update-modal.component.html b/eform-client/src/app/plugins/modules/backend-configuration-pn/modules/task-wizard/components/task-wizard-actions/task-wizard-update-modal/task-wizard-update-modal.component.html
index ee28683f..31af9e8d 100644
--- a/eform-client/src/app/plugins/modules/backend-configuration-pn/modules/task-wizard/components/task-wizard-actions/task-wizard-update-modal/task-wizard-update-modal.component.html
+++ b/eform-client/src/app/plugins/modules/backend-configuration-pn/modules/task-wizard/components/task-wizard-actions/task-wizard-update-modal/task-wizard-update-modal.component.html
@@ -9,11 +9,11 @@ <h3 mat-dialog-title>{{ 'Edit task' | translate }}</h3>
       {{ 'Status' | translate }}
     </mat-slide-toggle>
     <mat-slide-toggle *ngIf="selectCurrentUserIsAdmin$ | async"
-      class="p-2"
-      color="primary"
-      id="complianceEnabledToggle"
-      formControlName="complianceEnabled"
-      (change)="changeComplianceEnabled($event.checked)"
+                      class="p-2"
+                      color="primary"
+                      id="complianceEnabledToggle"
+                      formControlName="complianceEnabled"
+                      (change)="changeComplianceEnabled($event.checked)"
     >
       {{ 'Compliance' | translate }}
     </mat-slide-toggle>
@@ -59,29 +59,17 @@ <h3 mat-dialog-title>{{ 'Edit task' | translate }}</h3>
         </button>
       </div>
     </div>
-    <div class="d-flex flex-row">
-      <div style="width: 450px" class="p-2">
-        <button
-          mat-icon-button
-          color="accent"
-          id="updateFolder"
-          (click)="openFoldersModal()"
-          style="margin-left: -10px"
-          [disabled]="
+
+    <app-folder-tree-select
+      id="updateFolder"
+      [nodes]="foldersTreeDto"
+      [selectedNodeId]="taskForm.get('folderId')?.value"
+      (nodeSelected)="onFolderSelected($event)"
+      [disabled]="
             !taskForm.get('propertyId')?.value ||
             taskForm.get('status')?.value === TaskWizardStatusesEnum.Active
           "
-          [matTooltip]="
-            (!taskForm.get('propertyId')?.value
-              ? 'Need to select property'
-              : 'Select folder') | translate
-          "
-        >
-          <mat-icon>folder</mat-icon>
-        </button>
-        <span>{{ selectedFolderName || ('Folder not selected' | translate) }}</span>
-      </div>
-    </div>
+    ></app-folder-tree-select>
 
     <div class="d-flex flex-row">
       <mat-form-field class="p-3">
@@ -164,62 +152,64 @@ <h3 mat-dialog-title>{{ 'Edit task' | translate }}</h3>
         >
       </mat-form-field>-->
     <div formArrayName="translates">
-    <ng-container
-      *ngFor="let translate of taskForm.get('translates')['controls']; let i = index"
-      [formGroupName]="i"
-    >
-      <ng-container *ngIf="i % 2 === 0">
-        <div class="d-flex flex-row">
-          <mat-form-field class="p-2">
-            <mat-label>{{ 'Task description' | translate }}  ({{ getLanguageName(translate.get('languageId')?.value) }})
-            </mat-label>
-            <input
-              type="text"
-              id="updateName{{i}}"
-              matInput
-              formControlName="name"
-              [disabled]="taskForm.get('status')?.value === TaskWizardStatusesEnum.Active || copyModel.status === TaskWizardStatusesEnum.Active"
-            >
-          </mat-form-field>
-          <mat-form-field *ngIf="taskForm.get('translates')['controls'][i + 1] as nextTranslate" class="p-2">
-            <mat-label>{{ 'Task description' | translate }}  ({{ getLanguageName(nextTranslate.get('languageId')?.value) }})
-            </mat-label>
-            <input
-              type="text"
-              id="updateName{{i + 1}}"
-              matInput
-              [formControl]="nextTranslate.get('name')"
-              [disabled]="taskForm.get('status')?.value === TaskWizardStatusesEnum.Active || copyModel.status === TaskWizardStatusesEnum.Active"
-            >
-          </mat-form-field>
-        </div>
-        <!--    <mat-card-->
-        <!--      [class.mt-2]="!isFirst"-->
-        <!--      [class.mb-2]="isLast">-->
-        <!--      <mat-card-title>{{getLanguageName(languageModel.languageId)}}</mat-card-title>-->
-        <!--      <mat-card-content>-->
-        <!--        <mat-form-field>-->
-        <!--          <mat-label>{{'Task description' | translate}}</mat-label>-->
-        <!--          <input-->
-        <!--            type="text"-->
-        <!--            id="updateName{{i}}"-->
-        <!--            matInput-->
-        <!--            [ngModel]="languageModel.name"-->
-        <!--            (ngModelChange)="updateName($event, i)"-->
-        <!--            [disabled]="model.status === TaskWizardStatusesEnum.Active"-->
-        <!--          >-->
-        <!--        </mat-form-field>-->
-        <!--      </mat-card-content>-->
-        <!--    </mat-card>-->
+      <ng-container
+        *ngFor="let translate of taskForm.get('translates')['controls']; let i = index"
+        [formGroupName]="i"
+      >
+        <ng-container *ngIf="i % 2 === 0">
+          <div class="d-flex flex-row">
+            <mat-form-field class="p-2">
+              <mat-label>{{ 'Task description' | translate }}
+                ({{ getLanguageName(translate.get('languageId')?.value) }})
+              </mat-label>
+              <input
+                type="text"
+                id="updateName{{i}}"
+                matInput
+                formControlName="name"
+                [disabled]="taskForm.get('status')?.value === TaskWizardStatusesEnum.Active || copyModel.status === TaskWizardStatusesEnum.Active"
+              >
+            </mat-form-field>
+            <mat-form-field *ngIf="taskForm.get('translates')['controls'][i + 1] as nextTranslate" class="p-2">
+              <mat-label>{{ 'Task description' | translate }}
+                ({{ getLanguageName(nextTranslate.get('languageId')?.value) }})
+              </mat-label>
+              <input
+                type="text"
+                id="updateName{{i + 1}}"
+                matInput
+                [formControl]="nextTranslate.get('name')"
+                [disabled]="taskForm.get('status')?.value === TaskWizardStatusesEnum.Active || copyModel.status === TaskWizardStatusesEnum.Active"
+              >
+            </mat-form-field>
+          </div>
+          <!--    <mat-card-->
+          <!--      [class.mt-2]="!isFirst"-->
+          <!--      [class.mb-2]="isLast">-->
+          <!--      <mat-card-title>{{getLanguageName(languageModel.languageId)}}</mat-card-title>-->
+          <!--      <mat-card-content>-->
+          <!--        <mat-form-field>-->
+          <!--          <mat-label>{{'Task description' | translate}}</mat-label>-->
+          <!--          <input-->
+          <!--            type="text"-->
+          <!--            id="updateName{{i}}"-->
+          <!--            matInput-->
+          <!--            [ngModel]="languageModel.name"-->
+          <!--            (ngModelChange)="updateName($event, i)"-->
+          <!--            [disabled]="model.status === TaskWizardStatusesEnum.Active"-->
+          <!--          >-->
+          <!--        </mat-form-field>-->
+          <!--      </mat-card-content>-->
+          <!--    </mat-card>-->
 
-        <!--<app-eform-translation
-              [class.mt-2]="!isFirst"
-              [class.mb-2]="isLast"
-              [model]="languageModel"
-              (modelChange)="updateLanguageModel($event, i)"
-              [title]="getLanguageName(languageModel.languageId)"/>-->
+          <!--<app-eform-translation
+                [class.mt-2]="!isFirst"
+                [class.mb-2]="isLast"
+                [model]="languageModel"
+                (modelChange)="updateLanguageModel($event, i)"
+                [title]="getLanguageName(languageModel.languageId)"/>-->
+        </ng-container>
       </ng-container>
-    </ng-container>
     </div>
     <div class="d-flex flex-row">
       <mat-form-field class="p-2">
diff --git a/eform-client/src/app/plugins/modules/backend-configuration-pn/modules/task-wizard/components/task-wizard-actions/task-wizard-update-modal/task-wizard-update-modal.component.ts b/eform-client/src/app/plugins/modules/backend-configuration-pn/modules/task-wizard/components/task-wizard-actions/task-wizard-update-modal/task-wizard-update-modal.component.ts
index 0a92f1eb..eb07285d 100644
--- a/eform-client/src/app/plugins/modules/backend-configuration-pn/modules/task-wizard/components/task-wizard-actions/task-wizard-update-modal/task-wizard-update-modal.component.ts
+++ b/eform-client/src/app/plugins/modules/backend-configuration-pn/modules/task-wizard/components/task-wizard-actions/task-wizard-update-modal/task-wizard-update-modal.component.ts
@@ -62,6 +62,7 @@ export class TaskWizardUpdateModalComponent implements OnInit, OnDestroy {
   statuses: { label: string, value: number }[] = [];
   foldersTreeDto: FolderDto[] = [];
   selectedFolderName: string = '';
+  selectedFolderId: number;
   repeatTypeDay: { name: string, id: number }[] = [];
   repeatTypeWeek: { name: string, id: number }[] = [];
   repeatTypeMonth: { name: string, id: number }[] = [];
@@ -102,7 +103,7 @@ export class TaskWizardUpdateModalComponent implements OnInit, OnDestroy {
     return R.equals(this.taskForm.value, this.copyModel);
   }
 
-  
+
   constructor() {
     this.typeahead
       .pipe(
@@ -316,6 +317,12 @@ export class TaskWizardUpdateModalComponent implements OnInit, OnDestroy {
     }
   }
 
+  onFolderSelected(folder: FolderDto) {
+    this.taskForm.patchValue({ folderId: folder.id });
+    this.selectedFolderId = folder.id;
+    this.selectedFolderName = findFullNameById(folder.id, this.foldersTreeDto);
+  }
+
   update() {
 
     const task: TaskWizardCreateModel = {
diff --git a/eform-client/src/app/plugins/modules/backend-configuration-pn/modules/task-wizard/components/task-wizard-filters/task-wizard-filters.component.html b/eform-client/src/app/plugins/modules/backend-configuration-pn/modules/task-wizard/components/task-wizard-filters/task-wizard-filters.component.html
index 9ef086ad..bcb719ae 100644
--- a/eform-client/src/app/plugins/modules/backend-configuration-pn/modules/task-wizard/components/task-wizard-filters/task-wizard-filters.component.html
+++ b/eform-client/src/app/plugins/modules/backend-configuration-pn/modules/task-wizard/components/task-wizard-filters/task-wizard-filters.component.html
@@ -1,5 +1,5 @@
-<div class="d-flex flex-column" [formGroup]="filtersForm">
-  <div class="d-flex need-wrapper">
+<div class="d-flex flex-row align-items-center gap-12 px-3" [formGroup]="filtersForm">
+<!--  <div class="d-flex need-wrapper">-->
     <mat-form-field>
       <mat-label>{{'Location' | translate}}</mat-label>
       <mtx-select
@@ -22,8 +22,8 @@
         [bindLabel]="'name'"
       />
     </mat-form-field>
-  </div>
-  <div class="d-flex need-wrapper">
+<!--  </div>-->
+<!--  <div class="d-flex need-wrapper">-->
     <mat-form-field>
       <mat-label>{{'Tags' | translate}}</mat-label>
       <mtx-select
@@ -58,4 +58,4 @@
       />
     </mat-form-field>
   </div>
-</div>
+<!--</div>-->
diff --git a/eform-client/src/app/plugins/modules/backend-configuration-pn/modules/task-wizard/components/task-wizard-page/task-wizard-page.component.html b/eform-client/src/app/plugins/modules/backend-configuration-pn/modules/task-wizard/components/task-wizard-page/task-wizard-page.component.html
index 60668e56..0dc4c35a 100644
--- a/eform-client/src/app/plugins/modules/backend-configuration-pn/modules/task-wizard/components/task-wizard-page/task-wizard-page.component.html
+++ b/eform-client/src/app/plugins/modules/backend-configuration-pn/modules/task-wizard/components/task-wizard-page/task-wizard-page.component.html
@@ -1,14 +1,4 @@
 <eform-new-subheader>
-<!--  <button-->
-<!--    mat-icon-button-->
-<!--    color="primary"-->
-<!--    id="planningManageTagsBtn"-->
-<!--    (click)="openTagsModal()"-->
-<!--    matTooltip="{{ 'Manage tags' | translate }}"-->
-<!--    *ngIf="authStateService.isAdmin"-->
-<!--  >-->
-<!--    <mat-icon>discount</mat-icon>-->
-<!--  </button>-->
   <button
     class="btn-primary btn-primary--icon-left"
     [matTooltip]="'Create new task' | translate"
@@ -37,7 +27,7 @@
 />
 <button
   *ngIf="selectAuthIsAdmin$ | async;"
-  class="btn-warning mb-4"
+  class="btn-warning mb-4 ml-3"
   [disabled]="
     !selectedPlanningsCheckboxes || selectedPlanningsCheckboxes.length === 0
   "
diff --git a/eform-client/src/app/plugins/modules/backend-configuration-pn/modules/task-wizard/task-wizard.module.ts b/eform-client/src/app/plugins/modules/backend-configuration-pn/modules/task-wizard/task-wizard.module.ts
index adefdf3f..9c07a341 100644
--- a/eform-client/src/app/plugins/modules/backend-configuration-pn/modules/task-wizard/task-wizard.module.ts
+++ b/eform-client/src/app/plugins/modules/backend-configuration-pn/modules/task-wizard/task-wizard.module.ts
@@ -29,6 +29,9 @@ import {MatCardModule} from '@angular/material/card';
 import {PlanningsModule} from '../../../items-planning-pn/modules/plannings/plannings.module';
 import {StatisticsModule} from '../statistics/statistics.module';
 import {MatMenu, MatMenuItem, MatMenuTrigger} from "@angular/material/menu";
+import {
+  FolderTreeSelectComponent
+} from "src/app/common/modules/eform-shared/components/eform-tree-select/folder-tree-select.component";
 
 @NgModule({
   imports: [
@@ -57,6 +60,7 @@ import {MatMenu, MatMenuItem, MatMenuTrigger} from "@angular/material/menu";
     MatMenu,
     MatMenuItem,
     MatMenuTrigger,
+    FolderTreeSelectComponent,
   ],
   declarations: [
     TaskWizardFiltersComponent,