diff --git a/packages/distribution/addon/components/cd-document-header.hbs b/packages/distribution/addon/components/cd-document-header.hbs
index 0f23ea04b..4e9fb1e7e 100644
--- a/packages/distribution/addon/components/cd-document-header.hbs
+++ b/packages/distribution/addon/components/cd-document-header.hbs
@@ -1,4 +1,4 @@
-<p class="uk-text-large uk-margin-remove uk-flex uk-flex-middle">
+<div class="uk-text-large uk-flex uk-flex-middle" data-test-document-header>
   <div class="uk-width-expand">
     {{@name}}
     {{#if @group}}
@@ -9,4 +9,6 @@
     {{/if}}
   </div>
   {{yield}}
-</p>
\ No newline at end of file
+</div>
+
+<hr />
\ No newline at end of file
diff --git a/packages/distribution/addon/components/cd-inquiry-answer-form.hbs b/packages/distribution/addon/components/cd-inquiry-answer-form.hbs
index 069291ad0..667be17fa 100644
--- a/packages/distribution/addon/components/cd-inquiry-answer-form.hbs
+++ b/packages/distribution/addon/components/cd-inquiry-answer-form.hbs
@@ -11,37 +11,32 @@
           @name={{content.document.rootForm.raw.name}}
           @status={{if (eq this.inquiry.status "READY") this.answerStatus}}
         >
-          <div class="uk-flex uk-flex-middle">
-            <CdInquiryDialog::InquiryDeadline @inquiry={{this.inquiry}} />
+          <CdInquiryDialog::InquiryDeadline @inquiry={{this.inquiry}} />
 
-            {{#if this.inquiryDetails.length}}
-              <a
-                href=""
-                class="uk-margin-small-left uk-link-reset"
-                {{uk-tooltip
-                  (if
-                    this.isExpanded
-                    (t "caluma.distribution.answer.details.hide")
-                    (t "caluma.distribution.answer.details.show")
-                  )
+          {{#if this.inquiryDetails.length}}
+            <button
+              class="uk-icon-button uk-margin-left"
+              type="button"
+              {{uk-tooltip
+                (if
+                  this.isExpanded
+                  (t "caluma.distribution.answer.details.hide")
+                  (t "caluma.distribution.answer.details.show")
+                )
+              }}
+              {{on "click" this.toggle}}
+            >
+              <UkIcon
+                @icon={{if
+                  this.isExpanded
+                  "chevron-double-right"
+                  "chevron-double-left"
                 }}
-                {{on "click" this.toggle}}
-              >
-                <UkIcon
-                  @icon={{if
-                    this.isExpanded
-                    "chevron-double-right"
-                    "chevron-double-left"
-                  }}
-                />
-              </a>
-            {{/if}}
-          </div>
-
+              />
+            </button>
+          {{/if}}
         </CdDocumentHeader>
 
-        <hr />
-
         <div class="uk-margin uk-text-italic inquiry-answer-form__request">
           <CdInquiryDialog::InquiryPart
             @inquiry={{this.inquiry}}
diff --git a/packages/distribution/addon/components/cd-inquiry-edit-form.hbs b/packages/distribution/addon/components/cd-inquiry-edit-form.hbs
index 5ad638a89..f017fa337 100644
--- a/packages/distribution/addon/components/cd-inquiry-edit-form.hbs
+++ b/packages/distribution/addon/components/cd-inquiry-edit-form.hbs
@@ -13,7 +13,6 @@
       }}
     />
 
-    <hr />
     {{#if
       (and
         (cannot "send inquiry" this.inquiry)
diff --git a/packages/distribution/tests/integration/components/cd-document-header-test.js b/packages/distribution/tests/integration/components/cd-document-header-test.js
index 979130cce..402d32c0c 100644
--- a/packages/distribution/tests/integration/components/cd-document-header-test.js
+++ b/packages/distribution/tests/integration/components/cd-document-header-test.js
@@ -19,11 +19,11 @@ module("Integration | Component | cd-document-header", function (hooks) {
       />
     `);
 
-    assert.dom("p.uk-text-large").containsText("Test");
-    assert.dom("p.uk-text-large .uk-label").hasText("Test");
+    assert.dom("[data-test-document-header]").containsText("Test");
+    assert.dom("[data-test-document-header] .uk-label").hasText("Test");
 
     this.set("status", null);
 
-    assert.dom("p.uk-text-large .uk-label").doesNotExist();
+    assert.dom("[data-test-document-header] .uk-label").doesNotExist();
   });
 });
diff --git a/packages/distribution/tests/integration/components/cd-inquiry-answer-form-test.js b/packages/distribution/tests/integration/components/cd-inquiry-answer-form-test.js
index 3e8d9f3aa..17b6bd203 100644
--- a/packages/distribution/tests/integration/components/cd-inquiry-answer-form-test.js
+++ b/packages/distribution/tests/integration/components/cd-inquiry-answer-form-test.js
@@ -42,7 +42,7 @@ module("Integration | Component | cd-inquiry-answer-form", function (hooks) {
     await render(hbs`<CdInquiryAnswerForm @inquiry={{this.inquiry.id}} />`);
 
     assert
-      .dom("p.uk-text-large")
+      .dom("[data-test-document-header]")
       .containsText(
         "Inquiry answer t:caluma.distribution.answer.buttons.compose.status:()"
       );
diff --git a/packages/distribution/tests/integration/components/cd-inquiry-edit-form-test.js b/packages/distribution/tests/integration/components/cd-inquiry-edit-form-test.js
index 0b76eed9c..efdff8ef0 100644
--- a/packages/distribution/tests/integration/components/cd-inquiry-edit-form-test.js
+++ b/packages/distribution/tests/integration/components/cd-inquiry-edit-form-test.js
@@ -34,7 +34,7 @@ module("Integration | Component | cd-inquiry-edit-form", function (hooks) {
     await render(hbs`<CdInquiryEditForm @inquiry={{this.inquiry.id}} />`);
 
     assert
-      .dom("p.uk-text-large")
+      .dom("[data-test-document-header]")
       .hasText("Inquiry (group2) t:caluma.distribution.status.draft:()");
     assert.dom("form").exists();
     assert