diff --git a/src/app/features/tasks/add-task-bar/add-task-bar.component.html b/src/app/features/tasks/add-task-bar/add-task-bar.component.html
index d0a6e053662..6ac71bb41b2 100644
--- a/src/app/features/tasks/add-task-bar/add-task-bar.component.html
+++ b/src/app/features/tasks/add-task-bar/add-task-bar.component.html
@@ -35,6 +35,7 @@
     <div class="button-controls">
       <button
         (click)="isAddToBacklog=!isAddToBacklog"
+        [matTooltip]="T.F.TASK.ADD_TASK_BAR.TOGGLE_ADD_TO_BACKLOG_TODAY|translate"
         class="switch-add-to-btn"
         mat-icon-button
         type="button"
@@ -44,6 +45,7 @@
       </button>
       <button
         (click)="isAddToBottom=!isAddToBottom"
+        [matTooltip]="T.F.TASK.ADD_TASK_BAR.TOGGLE_ADD_TOP_OR_BOTTOM|translate"
         class="switch-add-to-bot-btn"
         mat-icon-button
         type="button"
diff --git a/src/app/features/tasks/task-attachment/task-attachment.module.ts b/src/app/features/tasks/task-attachment/task-attachment.module.ts
index b4180400cb2..d5544fff07e 100644
--- a/src/app/features/tasks/task-attachment/task-attachment.module.ts
+++ b/src/app/features/tasks/task-attachment/task-attachment.module.ts
@@ -13,6 +13,6 @@ import { TaskAttachmentListComponent } from './task-attachment-list/task-attachm
     TaskAttachmentLinkDirective,
     TaskAttachmentListComponent,
   ],
-  exports: [TaskAttachmentListComponent],
+  exports: [TaskAttachmentListComponent, TaskAttachmentLinkDirective],
 })
 export class TaskAttachmentModule {}
diff --git a/src/app/t.const.ts b/src/app/t.const.ts
index 6b21e11bad4..900184f891b 100644
--- a/src/app/t.const.ts
+++ b/src/app/t.const.ts
@@ -879,6 +879,8 @@ const T = {
         CREATE_TASK: 'F.TASK.ADD_TASK_BAR.CREATE_TASK',
         EXAMPLE: 'F.TASK.ADD_TASK_BAR.EXAMPLE',
         START: 'F.TASK.ADD_TASK_BAR.START',
+        TOGGLE_ADD_TO_BACKLOG_TODAY: 'F.TASK.ADD_TASK_BAR.TOGGLE_ADD_TO_BACKLOG_TODAY',
+        TOGGLE_ADD_TOP_OR_BOTTOM: 'F.TASK.ADD_TASK_BAR.TOGGLE_ADD_TOP_OR_BOTTOM',
       },
       B: {
         ADD_HALF_HOUR: 'F.TASK.B.ADD_HALF_HOUR',
diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json
index f7a5cb078ea..dd713fa1d3f 100644
--- a/src/assets/i18n/en.json
+++ b/src/assets/i18n/en.json
@@ -863,7 +863,9 @@
         "ADD_TASK_TO_TOP_OF_TODAY": "Add task to top of list",
         "CREATE_TASK": "Create new task",
         "EXAMPLE": "Example: \"Some task title @fri 4pm +projectName #some tag #some other tag 10m/3h\"",
-        "START": "Press enter one more time to start"
+        "START": "Press enter one more time to start",
+        "TOGGLE_ADD_TO_BACKLOG_TODAY": "Toggle adding task to backlog / today's list'",
+        "TOGGLE_ADD_TOP_OR_BOTTOM": "Toggle adding task to top & bottom of list"
       },
       "B": {
         "ADD_HALF_HOUR": "Add 1/2 hour",