diff --git a/public/js/pages/WorkorderAdmin/WorkorderAdmin.js b/public/js/pages/WorkorderAdmin/WorkorderAdmin.js
index 776e7fd44..71675ea46 100644
--- a/public/js/pages/WorkorderAdmin/WorkorderAdmin.js
+++ b/public/js/pages/WorkorderAdmin/WorkorderAdmin.js
@@ -44,23 +44,23 @@ Vue.component('workorder-admin', {
                 </div>
                 <div v-else><span>{{ row.companyName || 'N/A' }}</span></div>
               </div>
-              <div class="d-flex align-items-center">
+              <div style="display: grid; grid-template-columns: repeat(2, auto); gap: 0px; padding-left: 8px;">
                 <tt-button v-if="!['completed', 'new'].includes(row.status)" icon="fas fa-edit" @click="startCompanyEdit(row)"
-                           additional-class="btn-link btn-sm p-0 ml-2" title="Zuweisung ändern"/>
-                <tt-button v-if="row.status === 'intervention_required'" icon="ml-2 fas fa-check-circle text-success"
-                           @click="problemSolvedModalData = row" additional-class="btn-link btn-sm p-0" title="Auftrag auf Problem behoben setzen"/>
-                <tt-button v-if="['intervention_required', 'assigned'].includes(row.status)" icon="fas fa-hard-hat" @click="openCivilEngineeringModal(row)"
-                           additional-class="btn-link btn-sm p-0 ml-2 text-orange" title="Tiefbau benötigt"/>
-                <tt-button v-if="!['completed', 'cancelled'].includes(row.status)" icon="fas fa-ban" @click="cancelWorkorderModalData = row"
-                           additional-class="btn-link btn-sm p-0 ml-2 text-danger" title="Auftrag stornieren"/>
+                           additional-class="btn-link workorder-button" title="Zuweisung ändern" />
                 <tt-button v-if="!workordersToAssign.includes(row.id)" icon="fas fa-plus-circle text-success" @click="addToAssignList(row)"
-                           additional-class="btn-link btn-sm p-0 ml-2" title="Zur Zuweisungsliste hinzufügen"/>
+                           additional-class="btn-link workorder-button" title="Zur Zuweisungsliste hinzufügen" />
                 <tt-button v-if="workordersToAssign.includes(row.id)" icon="fas fa-minus-circle text-danger" @click="removeFromAssignList(row)"
-                           additional-class="btn-link btn-sm p-0 ml-2" title="Von Zuweisungsliste entfernen"/>
+                           additional-class="btn-link workorder-button" title="Von Zuweisungsliste entfernen" />
+                <tt-button v-if="row.status === 'intervention_required'" icon="fas fa-check-circle text-success"
+                           @click="problemSolvedModalData = row" additional-class="btn-link workorder-button" title="Auftrag auf Problem behoben setzen" />
+                <tt-button v-if="['intervention_required', 'assigned'].includes(row.status)" icon="fas fa-hard-hat text-orange" @click="openCivilEngineeringModal(row)"
+                           additional-class="btn-link workorder-button" title="Tiefbau benötigt" />
+                <tt-button v-if="!['completed', 'cancelled'].includes(row.status)" icon="fas fa-ban text-danger" @click="cancelWorkorderModalData = row"
+                           additional-class="btn-link workorder-button" title="Auftrag stornieren" />
               </div>
             </div>
           </template>
-
+          
           <template v-slot:additionalinfo="{ row }">
             <div v-if="editingAdditionalInfoId === row.id">
               <tt-textarea v-model="tempAdditionalInfo" @keydown.esc.native="cancelEdit" rows="3" no-form-group sm ref="editTextarea"/>
diff --git a/public/js/pages/WorkorderBase/WorkorderBase.css b/public/js/pages/WorkorderBase/WorkorderBase.css
index 5726b74f1..08c6beaeb 100644
--- a/public/js/pages/WorkorderBase/WorkorderBase.css
+++ b/public/js/pages/WorkorderBase/WorkorderBase.css
@@ -38,3 +38,7 @@
 .RMLWorkorderCompany-table .modal-body {
     overflow-y: hidden;
 }
+
+.workorder-button {
+    padding: 2px !important;
+}
\ No newline at end of file