diff --git a/client/src/app/site/motions/modules/motion-detail/components/amendment-create-wizard/amendment-create-wizard.component.ts b/client/src/app/site/motions/modules/motion-detail/components/amendment-create-wizard/amendment-create-wizard.component.ts
index c4e0f26b7..64d4f6fb8 100644
--- a/client/src/app/site/motions/modules/motion-detail/components/amendment-create-wizard/amendment-create-wizard.component.ts
+++ b/client/src/app/site/motions/modules/motion-detail/components/amendment-create-wizard/amendment-create-wizard.component.ts
@@ -264,7 +264,7 @@ export class AmendmentCreateWizardComponent extends BaseViewComponent implements
         });
         const newMotionValues = {
             ...this.contentForm.value,
-            title: this.translate.instant('Amendment to') + ' ' + this.motion.identifier,
+            title: this.translate.instant('Amendment to') + ' ' + this.motion.getIdentifierOrTitle(),
             text: text, // Workaround as 'text' is required from the backend
             parent_id: this.motion.id,
             category_id: this.motion.category_id,
diff --git a/client/src/app/site/motions/modules/motion-detail/components/motion-detail/motion-detail.component.html b/client/src/app/site/motions/modules/motion-detail/components/motion-detail/motion-detail.component.html
index 91b82a0b1..af98eb115 100644
--- a/client/src/app/site/motions/modules/motion-detail/components/motion-detail/motion-detail.component.html
+++ b/client/src/app/site/motions/modules/motion-detail/components/motion-detail/motion-detail.component.html
@@ -22,17 +22,19 @@
     </div>
 
     <!-- Back and forth buttons -->
-    <div *ngIf="!editMotion && !vp.isMobile" class="extra-controls-slot">
+    <div *ngIf="!editMotion && !vp.isMobile" class="extra-controls-slot prev-next-motion-controls">
         <div *ngIf="previousMotion">
             <button mat-button (click)="navigateToMotion(previousMotion)">
-                <mat-icon>chevron_left</mat-icon>
-                <span>{{ previousMotion.identifier }}</span>
+                <os-icon-container icon="chevron_left">
+                    {{ previousMotion.identifier }}
+                </os-icon-container>
             </button>
         </div>
         <div *ngIf="nextMotion">
             <button mat-button (click)="navigateToMotion(nextMotion)">
-                <span>{{ nextMotion.identifier }}</span>
-                <mat-icon>chevron_right</mat-icon>
+                <os-icon-container icon="chevron_right" [swap]="true">
+                    {{ nextMotion.identifier }}
+                </os-icon-container>
             </button>
         </div>
     </div>
@@ -464,7 +466,7 @@
                 <span *ngIf="amendments.length > 1">{{ 'Amendments' | translate }}</span>
             </a>
 
-            <br>
+            <br />
             <mat-checkbox [(ngModel)]="showAllAmendments" *ngIf="isRecoMode(ChangeRecoMode.Diff)">
                 {{ 'Show all changes' | translate }}
             </mat-checkbox>
@@ -534,8 +536,7 @@
                     mat-button
                     [matMenuTriggerFor]="changeRecoMenu"
                     *ngIf="
-                        motion &&
-                        ((allChangingObjects && allChangingObjects.length) || motion.modified_final_version)
+                        motion && ((allChangingObjects && allChangingObjects.length) || motion.modified_final_version)
                     "
                 >
                     <mat-icon>rate_review</mat-icon>
@@ -888,19 +889,28 @@
                     [class.line-numbers-outside]="isLineNumberingOutside()"
                     [class.amendment-context]="showAmendmentContext"
                 >
-                    <h3 class="amendment-line-header" *ngIf="!showAmendmentContext">{{ getAmendmentParagraphLinesTitle(paragraph) }}</h3>
+                    <h3 class="amendment-line-header" *ngIf="!showAmendmentContext">
+                        {{ getAmendmentParagraphLinesTitle(paragraph) }}
+                    </h3>
 
                     <os-motion-detail-original-change-recommendations
-                        *ngIf="isLineNumberingOutside() && (isRecoMode(ChangeRecoMode.Original) || isRecoMode(ChangeRecoMode.Changed))"
+                        *ngIf="
+                            isLineNumberingOutside() &&
+                            (isRecoMode(ChangeRecoMode.Original) || isRecoMode(ChangeRecoMode.Changed))
+                        "
                         [html]="getAmendmentDiffTextWithContext(paragraph)"
                         [changeRecommendations]="changeRecommendations"
                         (createChangeRecommendation)="createChangeRecommendation($event)"
                         (gotoChangeRecommendation)="gotoChangeRecommendation($event)"
                     ></os-motion-detail-original-change-recommendations>
                     <div
-                        *ngIf="!isLineNumberingOutside() || !(isRecoMode(ChangeRecoMode.Original) || isRecoMode(ChangeRecoMode.Changed))"
+                        *ngIf="
+                            !isLineNumberingOutside() ||
+                            !(isRecoMode(ChangeRecoMode.Original) || isRecoMode(ChangeRecoMode.Changed))
+                        "
                         [outerHTML]="getAmendmentDiffTextWithContext(paragraph) | trust: 'html'"
-                    ></div><!-- the <div> element is only a placeholder -> outerHTML to replace it -->
+                    ></div>
+                    <!-- the <div> element is only a placeholder -> outerHTML to replace it -->
                 </div>
             </ng-container>
 
diff --git a/client/src/app/site/motions/modules/motion-detail/components/motion-detail/motion-detail.component.scss b/client/src/app/site/motions/modules/motion-detail/components/motion-detail/motion-detail.component.scss
index 87e61c8ad..664d1dda5 100644
--- a/client/src/app/site/motions/modules/motion-detail/components/motion-detail/motion-detail.component.scss
+++ b/client/src/app/site/motions/modules/motion-detail/components/motion-detail/motion-detail.component.scss
@@ -8,18 +8,9 @@ span {
     margin-bottom: 1em;
 }
 
-.extra-controls-slot {
+.prev-next-motion-controls {
     div {
-        padding: 0px;
-        button {
-            .mat-button-wrapper {
-                display: inherit;
-            }
-            font-size: 100%;
-        }
-        span {
-            font-size: 80%;
-        }
+        display: inherit;
     }
 }