diff --git a/src/components/lists/AssetTypeList.vue b/src/components/lists/AssetTypeList.vue
index b2d97106b..3feaa288a 100644
--- a/src/components/lists/AssetTypeList.vue
+++ b/src/components/lists/AssetTypeList.vue
@@ -20,6 +20,13 @@
           <tr class="datatable-row" v-for="entry in entries" :key="entry.id">
             <td class="name">
               {{ entry.name }}
+              <span
+                class="help-tooltip"
+                :title="entry.description"
+                v-if="entry.description"
+              >
+                <help-circle-icon class="icon is-small" />
+              </span>
             </td>
             <td class="short-name">
               {{ entry.short_name }}
@@ -56,6 +63,7 @@
 
 <script>
 import { sortTaskTypes } from '@/lib/sorting'
+import { HelpCircleIcon } from 'vue-feather-icons'
 
 import { mapGetters, mapActions } from 'vuex'
 import RowActionsCell from '@/components/cells/RowActionsCell'
@@ -85,7 +93,8 @@ export default {
   components: {
     TaskTypeName,
     RowActionsCell,
-    TableInfo
+    TableInfo,
+    HelpCircleIcon
   },
   computed: {
     ...mapGetters(['taskTypeMap'])
diff --git a/src/components/lists/TaskStatusList.vue b/src/components/lists/TaskStatusList.vue
index e0cc2f24e..87ab7f287 100644
--- a/src/components/lists/TaskStatusList.vue
+++ b/src/components/lists/TaskStatusList.vue
@@ -43,7 +43,16 @@
             v-for="entry in entries"
             :key="entry.id"
           >
-            <td class="name">{{ entry.name }}</td>
+            <td class="name">
+              {{ entry.name }}
+              <span
+                class="help-tooltip"
+                :title="entry.description"
+                v-if="entry.description"
+              >
+                <help-circle-icon class="icon is-small" />
+              </span>
+            </td>
             <task-status-cell class="short-name" :entry="entry" />
             <boolean-cell class="is-default" :value="entry.is_default" />
             <boolean-cell class="is-done" :value="entry.is_done" />
@@ -81,6 +90,7 @@
 
 <script>
 import draggable from 'vuedraggable'
+import { HelpCircleIcon } from 'vue-feather-icons'
 
 import { formatListMixin } from '@/components/mixins/format'
 
@@ -110,6 +120,7 @@ export default {
   },
 
   components: {
+    HelpCircleIcon,
     BooleanCell,
     draggable,
     RowActionsCell,
diff --git a/src/components/lists/TaskTypeList.vue b/src/components/lists/TaskTypeList.vue
index a975a4faf..d018cec62 100644
--- a/src/components/lists/TaskTypeList.vue
+++ b/src/components/lists/TaskTypeList.vue
@@ -16,6 +16,9 @@
             <th scope="col" class="allow-timelog">
               {{ $t('task_types.fields.allow_timelog') }}
             </th>
+            <th scope="col" class="description">
+              {{ $t('task_types.fields.description') }}
+            </th>
             <th scope="col" class="actions"></th>
           </tr>
         </thead>
@@ -53,6 +56,9 @@
             <td class="allow-timelog">
               <boolean-rep :value="taskType.allow_timelog" />
             </td>
+            <td>
+              {{ taskType.description }}
+            </td>
             <row-actions-cell
               :taskType-id="taskType.id"
               @delete-clicked="$emit('delete-clicked', taskType)"
diff --git a/src/components/modals/EditAssetTypeModal.vue b/src/components/modals/EditAssetTypeModal.vue
index 790fd5167..62aca303f 100644
--- a/src/components/modals/EditAssetTypeModal.vue
+++ b/src/components/modals/EditAssetTypeModal.vue
@@ -32,6 +32,11 @@
             v-model="form.short_name"
             @enter="runConfirmation"
           />
+          <textarea-field
+            :label="$t('asset_types.fields.description')"
+            v-model="form.description"
+            @enter="runConfirmation"
+          />
           <combobox-boolean
             :label="$t('main.archived')"
             @enter="runConfirmation"
@@ -91,6 +96,7 @@ import Combobox from '@/components/widgets/Combobox.vue'
 import ComboboxBoolean from '@/components/widgets/ComboboxBoolean.vue'
 import ModalFooter from '@/components/modals/ModalFooter'
 import TextField from '@/components/widgets/TextField'
+import TextareaField from '@/components/widgets/TextareaField'
 import TaskTypeName from '@/components/widgets/TaskTypeName'
 
 export default {
@@ -101,7 +107,8 @@ export default {
     ComboboxBoolean,
     TaskTypeName,
     ModalFooter,
-    TextField
+    TextField,
+    TextareaField
   },
 
   props: {
diff --git a/src/components/modals/EditTaskStatusModal.vue b/src/components/modals/EditTaskStatusModal.vue
index dc73d1fda..23c485d89 100644
--- a/src/components/modals/EditTaskStatusModal.vue
+++ b/src/components/modals/EditTaskStatusModal.vue
@@ -33,9 +33,14 @@
             :maxlength="8"
             @enter="confirmClicked"
             v-model="form.short_name"
-            v-focus
             v-if="taskStatusToEdit.short_name !== 'todo'"
           />
+          <textarea-field
+            input-class="task-status-description"
+            :label="$t('task_status.fields.description')"
+            @enter="confirmClicked"
+            v-model="form.description"
+          />
           <boolean-field
             :label="$t('task_status.fields.is_default')"
             @enter="confirmClicked"
@@ -113,6 +118,7 @@ import ComboboxBoolean from '@/components/widgets/ComboboxBoolean'
 import ColorField from '@/components/widgets/ColorField'
 import ModalFooter from '@/components/modals/ModalFooter'
 import TextField from '@/components/widgets/TextField'
+import TextareaField from '@/components/widgets/TextareaField'
 
 export default {
   name: 'edit-task-status-modal',
@@ -122,7 +128,8 @@ export default {
     ColorField,
     ComboboxBoolean,
     ModalFooter,
-    TextField
+    TextField,
+    TextareaField
   },
 
   props: {
@@ -149,6 +156,7 @@ export default {
       form: {
         name: '',
         short_name: '',
+        description: '',
         color: '$grey999',
         is_done: 'false',
         is_feedback_request: 'false',
@@ -216,6 +224,7 @@ export default {
         this.form = {
           name: this.taskStatusToEdit.name,
           short_name: this.taskStatusToEdit.short_name,
+          description: this.taskStatusToEdit.description,
           color: this.taskStatusToEdit.color,
           is_done: String(this.taskStatusToEdit.is_done),
           is_retake: String(this.taskStatusToEdit.is_retake || false),
diff --git a/src/components/modals/EditTaskTypeModal.vue b/src/components/modals/EditTaskTypeModal.vue
index 13e94d2e7..e2ca32882 100644
--- a/src/components/modals/EditTaskTypeModal.vue
+++ b/src/components/modals/EditTaskTypeModal.vue
@@ -35,6 +35,11 @@
             @enter="confirmClicked"
             v-model="form.allow_timelog"
           />
+          <textarea-field
+            :label="$t('task_types.fields.description')"
+            v-model="form.description"
+            @enter="confirmClicked"
+          />
           <combobox-simple
             class="field"
             :label="$t('task_types.fields.dedicated_to')"
@@ -85,6 +90,7 @@ import ComboboxDepartment from '@/components/widgets/ComboboxDepartment'
 import ColorField from '@/components/widgets/ColorField'
 import ModalFooter from '@/components/modals/ModalFooter'
 import TextField from '@/components/widgets/TextField'
+import TextareaField from '@/components/widgets/TextareaField'
 
 export default {
   name: 'edit-task-type-modal',
@@ -96,7 +102,8 @@ export default {
     ComboboxDepartment,
     ColorField,
     ModalFooter,
-    TextField
+    TextField,
+    TextareaField
   },
 
   props: {
diff --git a/src/components/pages/AssetTypes.vue b/src/components/pages/AssetTypes.vue
index ca01609a4..b78047545 100644
--- a/src/components/pages/AssetTypes.vue
+++ b/src/components/pages/AssetTypes.vue
@@ -181,6 +181,7 @@ export default {
         this.$t('main.type'),
         this.$t('asset_types.fields.name'),
         this.$t('asset_types.fields.short_name'),
+        this.$t('asset_types.fields.description'),
         this.$t('asset_types.fields.task_types')
       ]
       const entries = [headers].concat(
@@ -188,6 +189,7 @@ export default {
           assetType.type,
           assetType.name,
           assetType.short_name,
+          assetType.description,
           assetType.task_types.length
             ? assetType.task_types
                 .map(taskTypeId => this.taskTypeMap.get(taskTypeId)?.name)
diff --git a/src/components/pages/TaskStatus.vue b/src/components/pages/TaskStatus.vue
index 3d7763a6b..53a48c405 100644
--- a/src/components/pages/TaskStatus.vue
+++ b/src/components/pages/TaskStatus.vue
@@ -200,6 +200,7 @@ export default {
         this.$t('main.type'),
         this.$t('task_status.fields.name'),
         this.$t('task_status.fields.short_name'),
+        this.$t('task_status.fields.description'),
         this.$t('task_status.fields.color'),
         this.$t('task_status.fields.is_default'),
         this.$t('task_status.fields.is_done'),
@@ -213,6 +214,7 @@ export default {
           taskStatus.type,
           taskStatus.name,
           taskStatus.short_name,
+          taskStatus.description,
           taskStatus.color,
           taskStatus.is_default,
           taskStatus.is_done,
diff --git a/src/components/pages/TaskTypes.vue b/src/components/pages/TaskTypes.vue
index 1777071bb..d9906401c 100644
--- a/src/components/pages/TaskTypes.vue
+++ b/src/components/pages/TaskTypes.vue
@@ -243,6 +243,7 @@ export default {
         this.$t('task_types.fields.dedicated_to'),
         this.$t('task_types.fields.department'),
         this.$t('task_types.fields.name'),
+        this.$t('task_types.fields.description'),
         this.$t('task_types.fields.color'),
         this.$t('task_types.fields.allow_timelog')
       ]
@@ -252,6 +253,7 @@ export default {
           taskType.for_entity,
           this.departmentMap.get(taskType.department_id)?.name,
           taskType.name,
+          taskType.description,
           taskType.color,
           taskType.allow_timelog
         ])
diff --git a/src/locales/de.js b/src/locales/de.js
index 0eec698cf..e0da28d3f 100644
--- a/src/locales/de.js
+++ b/src/locales/de.js
@@ -40,7 +40,8 @@ export default {
     production_title: 'Vermögensarten Statistiken',
     fields: {
       name: 'Name',
-      short_name: 'Kurzname'
+      short_name: 'Kurzname',
+      description: 'Beschreibung'
     }
   },
 
@@ -579,7 +580,8 @@ export default {
       is_retake: 'Hat Wiederholungswert',
       is_default: 'Is default',
       name: 'Name',
-      short_name: 'Kurzname'
+      short_name: 'Kurzname',
+      description: 'Beschreibung'
     }
   },
 
@@ -594,6 +596,7 @@ export default {
       dedicated_to: 'Für',
       color: 'Farbe',
       name: 'Name',
+      description: 'Beschreibung',
       allow_timelog: 'Zeiterfassung',
       priority: 'Priorität'
     }
diff --git a/src/locales/en.js b/src/locales/en.js
index acbeac596..2074d47ae 100644
--- a/src/locales/en.js
+++ b/src/locales/en.js
@@ -50,6 +50,7 @@ export default {
     fields: {
       name: 'Name',
       short_name: 'Short Name',
+      description: 'Description',
       task_types: 'Workflow'
     }
   },
@@ -1225,7 +1226,8 @@ export default {
       is_retake: 'Has retake value',
       is_default: 'Is default',
       name: 'Name',
-      short_name: 'Short Name'
+      short_name: 'Short name',
+      description: 'Description'
     }
   },
 
@@ -1244,6 +1246,7 @@ export default {
       color: 'Color',
       name: 'Name',
       short_name: 'Short Name',
+      description: 'Description',
       allow_timelog: 'Timelog',
       priority: 'Priority'
     }
diff --git a/src/locales/fa.js b/src/locales/fa.js
index 5011dc0f4..d6aba150d 100644
--- a/src/locales/fa.js
+++ b/src/locales/fa.js
@@ -40,7 +40,8 @@ export default {
     production_title: 'آمار تمام منابع',
     fields: {
       name: 'نام',
-      short_name: 'اسم کوتاه'
+      short_name: 'اسم کوتاه',
+      description: 'توضیحات'
     }
   },
 
@@ -565,7 +566,8 @@ export default {
       is_done: 'انجام شده',
       is_retake: 'بازنگری',
       name: 'نام',
-      short_name: 'اسم کوتاه'
+      short_name: 'اسم کوتاه', 
+      description: 'توضیحات'
     }
   },
 
@@ -581,6 +583,7 @@ export default {
       color: 'رنگ',
       name: 'نام',
       allow_timelog: 'ضبط زمان',
+      description: 'توضیحات',
       priority: 'اولویت'
     }
   },
diff --git a/src/store/api/assettypes.js b/src/store/api/assettypes.js
index 8356e2127..fddc65608 100644
--- a/src/store/api/assettypes.js
+++ b/src/store/api/assettypes.js
@@ -13,6 +13,7 @@ export default {
     const data = {
       name: assetType.name,
       short_name: assetType.short_name,
+      description: assetType.description,
       task_types: assetType.task_types
     }
     return client.ppost('/api/data/entity-types', data)
@@ -22,6 +23,7 @@ export default {
     const data = {
       name: assetType.name,
       short_name: assetType.short_name,
+      description: assetType.description,
       task_types: assetType.task_types,
       archived: assetType.archived === 'true'
     }
diff --git a/src/store/api/taskstatus.js b/src/store/api/taskstatus.js
index e3d9c74e4..337137e7a 100644
--- a/src/store/api/taskstatus.js
+++ b/src/store/api/taskstatus.js
@@ -4,6 +4,7 @@ const sanitizeTaskStatus = taskStatus => {
   return {
     name: taskStatus.name,
     short_name: taskStatus.short_name,
+    description: taskStatus.description,
     for_concept: Boolean(taskStatus.for_concept === 'true'),
     is_default: Boolean(taskStatus.is_default === 'true'),
     is_done: Boolean(taskStatus.is_done === 'true'),
diff --git a/src/store/api/tasktypes.js b/src/store/api/tasktypes.js
index 69ef56c5e..8efd3d916 100644
--- a/src/store/api/tasktypes.js
+++ b/src/store/api/tasktypes.js
@@ -9,6 +9,7 @@ export default {
     const data = {
       name: taskType.name,
       short_name: taskType.short_name,
+      description: taskType.description,
       color: taskType.color,
       priority: Number(taskType.priority),
       for_entity: taskType.for_entity,
@@ -22,6 +23,7 @@ export default {
     const data = {
       name: taskType.name,
       short_name: taskType.short_name,
+      description: taskType.description,
       color: taskType.color,
       department_id: taskType.department_id
     }