diff --git a/client/src/app/shared/components/icon-container/icon-container.component.scss b/client/src/app/shared/components/icon-container/icon-container.component.scss
index 4bae28c16..98bdb2892 100644
--- a/client/src/app/shared/components/icon-container/icon-container.component.scss
+++ b/client/src/app/shared/components/icon-container/icon-container.component.scss
@@ -14,6 +14,7 @@ os-icon-container {
             font-size: $size;
             height: $size;
             width: $size;
+            margin-top: 0 !important;
         }
     }
 
@@ -25,6 +26,7 @@ os-icon-container {
             font-size: $size;
             width: $size;
             height: $size;
+            margin-top: 0 !important;
         }
 
         .content-node {
diff --git a/client/src/app/site/motions/modules/motion-detail/components/motion-detail-diff/motion-detail-diff.component.scss b/client/src/app/site/motions/modules/motion-detail/components/motion-detail-diff/motion-detail-diff.component.scss
index 44f738980..b02c1c16e 100644
--- a/client/src/app/site/motions/modules/motion-detail/components/motion-detail-diff/motion-detail-diff.component.scss
+++ b/client/src/app/site/motions/modules/motion-detail/components/motion-detail-diff/motion-detail-diff.component.scss
@@ -1,11 +1,12 @@
 /* Diffbox */
 .diff-box {
+    position: relative;
     background-color: #f9f9f9;
     border: solid 1px #eee;
     border-radius: 3px;
     margin-bottom: 0;
     padding-top: 0;
-    padding-right: 155px;
+    padding-right: 40px;
 
     &:hover {
         background-color: #f0f0f0;
@@ -15,18 +16,10 @@
         }
     }
 
-    .mat-icon-button {
-        margin-top: -20px;
-    }
-
     .action-row {
+        position: absolute;
+        right: 0;
         font-size: 0.8em;
-        height: 22px;
-        padding-top: 2px;
-        float: right;
-        width: 150px;
-        text-align: right;
-        margin-right: -150px;
         opacity: 0.5;
         overflow: hidden;
 
@@ -44,6 +37,7 @@
             min-width: 68px;
         }
     }
+
     .status-row {
         font-style: italic;
         color: gray;
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 f06de8a47..02180cfe9 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
@@ -465,7 +465,7 @@
     <form class="motion-content" [formGroup]="contentForm" (keydown)="onKeyDown($event)">
         <!-- Toolbar with text controls and buttonf for managing the (modified) final version-->
         <div
-            class="motion-text-toolbar-wrapper outline-border-bottom"
+            class="motion-text-toolbar-wrapper"
             *ngIf="!editMotion && !motion.isStatuteAmendment()"
         >
             <!-- Line Number and Diff buttons -->
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 915155600..e289be6af 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
@@ -29,12 +29,8 @@ span {
 
     button {
         font-weight: 400;
-        margin-top: 7px;
     }
-
-    height: 50px;
-    margin: -16px -16px 5px -16px;
-    padding: 0 16px;
+    margin-bottom: 16px;
 
     > button {
         // Prevent moving the buttons when the "go to line"-input is shown