diff --git a/frank-doc-frontend/src/app/views/details/details-element/details-element-attributes/details-element-attributes.component.html b/frank-doc-frontend/src/app/views/details/details-element/details-element-attributes/details-element-attributes.component.html
index 3317d496..f1656132 100644
--- a/frank-doc-frontend/src/app/views/details/details-element/details-element-attributes/details-element-attributes.component.html
+++ b/frank-doc-frontend/src/app/views/details/details-element/details-element-attributes/details-element-attributes.component.html
@@ -75,16 +75,12 @@
     <tr
       class="border-top"
       [ngClass]="{
-        'padding-bottom': !attribute.enum && !attribute.description,
+        'padding-bottom': !attribute.enum && !attribute.description && !attribute.deprecated,
         deprecated: attribute.deprecated,
         forRemoval: attribute.deprecated && attribute.deprecated.forRemoval,
       }"
     >
-      <td
-        class="name"
-        [title]="attribute.deprecated ? getDeprecatedTitle(attribute.deprecated) : ''"
-        [innerHTML]="attributeEntry.name | nameWbr"
-      ></td>
+      <td class="name" [innerHTML]="attributeEntry.name | nameWbr"></td>
       <td>{{ attribute.enum ? 'options' : getFriendlyType(attribute.type) }}</td>
       <td
         class="attribute-default-value"
@@ -92,14 +88,16 @@
         [innerHTML]="text"
       ></td>
     </tr>
-    @if (attribute.description) {
+    @if (attribute.description || attribute.deprecated) {
       <tr [ngClass]="{ 'padding-bottom': !attribute.enum }">
-        <td
-          colspan="3"
-          class="description"
-          *fdJavadocTransform="let text of attribute.description; elements: elements()"
-          [innerHTML]="text"
-        ></td>
+        <td colspan="3" class="description">
+          @if (attribute.deprecated) {
+            <div class="deprecated-text">{{ getDeprecatedDescription(attribute.deprecated) }}</div>
+          }
+          @if (attribute.description) {
+            <div *fdJavadocTransform="let text of attribute.description; elements: elements()" [innerHTML]="text"></div>
+          }
+        </td>
       </tr>
     }
     @if (attribute.enum) {
diff --git a/frank-doc-frontend/src/app/views/details/details-element/details-element-attributes/details-element-attributes.component.ts b/frank-doc-frontend/src/app/views/details/details-element/details-element-attributes/details-element-attributes.component.ts
index 19a319a0..5c55f095 100644
--- a/frank-doc-frontend/src/app/views/details/details-element/details-element-attributes/details-element-attributes.component.ts
+++ b/frank-doc-frontend/src/app/views/details/details-element/details-element-attributes/details-element-attributes.component.ts
@@ -13,6 +13,7 @@ import { CollapseDirective } from '../../../../components/collapse.directive';
 import { NameWbrPipe } from '../../../../components/name-wbr.pipe';
 import { IconCaretComponent } from '../../../../icons/icon-caret-down/icon-caret.component';
 import { DEFAULT_RETURN_CHARACTER } from '../../../../app.constants';
+import { IconHelpComponent } from '../../../../icons/icon-help/icon-help.component';
 
 type EnumValueEntry = {
   valueName: string;
@@ -21,7 +22,15 @@ type EnumValueEntry = {
 
 @Component({
   selector: 'app-details-element-attributes',
-  imports: [IconCaretComponent, NgTemplateOutlet, JavadocTransformDirective, NameWbrPipe, NgClass, CollapseDirective],
+  imports: [
+    IconCaretComponent,
+    NgTemplateOutlet,
+    JavadocTransformDirective,
+    NameWbrPipe,
+    NgClass,
+    CollapseDirective,
+    IconHelpComponent,
+  ],
   templateUrl: './details-element-attributes.component.html',
   styleUrl: '../details-element-options.scss',
 })
@@ -44,8 +53,8 @@ export class DetailsElementAttributesComponent {
     return this.getInheritedCollapseOptions(this.inheritedCollapseOptions, parentElementName, defaultValue);
   }
 
-  protected getDeprecatedTitle(deprecatedInfo: DeprecationInfo): string {
-    return `${deprecatedInfo.description ?? 'This has been deprecated!'}${deprecatedInfo.since ? `\nSince ${deprecatedInfo.since}` : ''}`;
+  protected getDeprecatedDescription(deprecatedInfo: DeprecationInfo): string {
+    return `${deprecatedInfo.description ?? 'This has been deprecated'}${deprecatedInfo.since ? `\nSince ${deprecatedInfo.since}` : ''}`;
   }
 
   protected getFriendlyType(type: Attribute['type']): string {
diff --git a/frank-doc-frontend/src/app/views/details/details-element/details-element-nested/details-element-nested.component.html b/frank-doc-frontend/src/app/views/details/details-element/details-element-nested/details-element-nested.component.html
index 0a75b488..2a33d7e5 100644
--- a/frank-doc-frontend/src/app/views/details/details-element/details-element-nested/details-element-nested.component.html
+++ b/frank-doc-frontend/src/app/views/details/details-element/details-element-nested/details-element-nested.component.html
@@ -13,11 +13,6 @@
         [ngClass]="{ deprecated: nestedElement.deprecated, 'padding-bottom': !nestedElement.type }"
       >
         <td class="name" [innerHTML]="nestedElement.roleName | nameWbr"></td>
-        <td
-          class="description"
-          *fdJavadocTransform="let text of nestedElement.description ?? DEFAULT_RETURN_CHARACTER; elements: elements()"
-          [innerHTML]="text"
-        ></td>
         <td>{{ nestedElement.mandatory ? '1' : '0' }} .. {{ nestedElement.multiple ? 'n' : '1' }}</td>
       </tr>
       @if (nestedElement.type) {
diff --git a/frank-doc-frontend/src/app/views/details/details-element/details-element-nested/details-element-nested.component.ts b/frank-doc-frontend/src/app/views/details/details-element/details-element-nested/details-element-nested.component.ts
index c28c33b9..8ebd5178 100644
--- a/frank-doc-frontend/src/app/views/details/details-element/details-element-nested/details-element-nested.component.ts
+++ b/frank-doc-frontend/src/app/views/details/details-element/details-element-nested/details-element-nested.component.ts
@@ -6,10 +6,11 @@ import { JavadocTransformDirective } from '@frankframework/doc-library-ng';
 import { DEFAULT_RETURN_CHARACTER } from '../../../../app.constants';
 import { AppService } from '../../../../app.service';
 import { NameWbrPipe } from '../../../../components/name-wbr.pipe';
+import { IconHelpComponent } from '../../../../icons/icon-help/icon-help.component';
 
 @Component({
   selector: 'app-details-element-nested',
-  imports: [JavadocTransformDirective, NameWbrPipe, NgClass, RouterLink],
+  imports: [JavadocTransformDirective, NameWbrPipe, NgClass, RouterLink, IconHelpComponent],
   templateUrl: './details-element-nested.component.html',
   styleUrl: '../details-element-options.scss',
 })
diff --git a/frank-doc-frontend/src/app/views/details/details-element/details-element-options.scss b/frank-doc-frontend/src/app/views/details/details-element/details-element-options.scss
index 081adbe4..5525daad 100644
--- a/frank-doc-frontend/src/app/views/details/details-element/details-element-options.scss
+++ b/frank-doc-frontend/src/app/views/details/details-element/details-element-options.scss
@@ -17,8 +17,10 @@ table {
 
   tr.deprecated > td:first-child {
     text-decoration: line-through;
+    position: relative;
 
     &.forRemoval {
+      color: var(--color-alert-error);
       text-decoration-color: var(--color-alert-error);
     }
   }
@@ -89,6 +91,11 @@ table {
 .description {
   margin-bottom: 2em;
   color: var(--color-gray-dark);
+
+  .deprecated-text {
+    font-style: italic;
+    white-space: pre-line;
+  }
 }
 
 .options-sub-title {