diff --git a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-resources/task-definition-resources.component.html b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-resources/task-definition-resources.component.html
index 651710014..1338b8db8 100644
--- a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-resources/task-definition-resources.component.html
+++ b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-resources/task-definition-resources.component.html
@@ -1,16 +1,32 @@
 <div class="flex flex-row gap-4">
   <div class="basis-1/2 flex flex-col">
-    <f-file-drop mode="event" (filesDropped)="uploadTaskSheet($event)" accept="application/pdf" [desiredFileName]="'Task ' + taskDefinition.abbreviation + ' pdf'" />
+    <f-file-drop
+      mode="event"
+      (filesDropped)="uploadTaskSheet($event)"
+      accept="application/pdf"
+      [desiredFileName]="'Task ' + taskDefinition.abbreviation + ' pdf'"
+    />
     <div *ngIf="taskDefinition.hasTaskSheet" class="flex flex-row gap-4 pt-4">
-      <button mat-flat-button color="accent" (click)="downloadTaskSheet()" class="flex-grow ms-4">Download Task Sheet</button>
       <button mat-flat-button color="warn" (click)="removeTaskSheet()" class="flex-grow me-4">Delete Task Sheet</button>
+      <button mat-flat-button color="accent" (click)="downloadTaskSheet()" class="flex-grow ms-4">
+        Download Task Sheet
+      </button>
     </div>
   </div>
   <div class="basis-1/2 flex flex-col">
-    <f-file-drop mode="event" (filesDropped)="uploadTaskResources($event)" accept="application/pdf" [desiredFileName]="'Task ' + taskDefinition.abbreviation + ' zip'" />
+    <f-file-drop
+      mode="event"
+      (filesDropped)="uploadTaskResources($event)"
+      accept="application/pdf"
+      [desiredFileName]="'Task ' + taskDefinition.abbreviation + ' zip'"
+    />
     <div *ngIf="taskDefinition.hasTaskResources" class="flex flex-row gap-4 pt-4">
-      <button mat-flat-button color="accent" (click)="downloadTaskResources()" class="flex-grow ms-4">Download Task Zip</button>
-      <button mat-flat-button color="warn" (click)="removeTaskResources()" class="flex-grow me-4">Delete Task Zip</button>
+      <button mat-flat-button color="warn" (click)="removeTaskResources()" class="flex-grow me-4">
+        Delete Task Zip
+      </button>
+      <button mat-flat-button color="accent" (click)="downloadTaskResources()" class="flex-grow ms-4">
+        Download Task Zip
+      </button>
     </div>
   </div>
 </div>
diff --git a/src/app/units/states/edit/directives/unit-tasks-editor/unit-task-editor.component.html b/src/app/units/states/edit/directives/unit-tasks-editor/unit-task-editor.component.html
index ef3afddc4..3ac754ae5 100644
--- a/src/app/units/states/edit/directives/unit-tasks-editor/unit-task-editor.component.html
+++ b/src/app/units/states/edit/directives/unit-tasks-editor/unit-task-editor.component.html
@@ -86,17 +86,17 @@ <h3>Task List</h3>
       ></tr>
     </table>
     <span class="flex items-center">
-      <button mat-raised-button color="primary" (click)="createTaskDefinition()">Add Task</button>
+      <mat-paginator class="mat-elevation-z0" [pageSizeOptions]="[5, 10, 25, 100]"></mat-paginator>
       <span class="flex-grow"></span>
       <label>Definitions CSV</label>
-      <button mat-mini-fab (click)="unit.downloadTaskDefinitionsCsv()"><mat-icon>download</mat-icon></button>
-      <button mat-mini-fab (click)="uploadTaskDefinitionsCsv()"><mat-icon>upload_file</mat-icon></button>
+      <button mat-icon-button (click)="unit.downloadTaskDefinitionsCsv()"><mat-icon>download</mat-icon></button>
+      <button mat-icon-button (click)="uploadTaskDefinitionsCsv()"><mat-icon>upload_file</mat-icon></button>
       <span class="flex-grow"></span>
       <label>Resources as Zip</label>
-      <button mat-mini-fab (click)="unit.downloadAllTaskResourcesZip()"><mat-icon>download</mat-icon></button>
-      <button mat-mini-fab (click)="uploadTaskResourcesZip()"><mat-icon>upload_file</mat-icon></button>
+      <button mat-icon-button (click)="unit.downloadAllTaskResourcesZip()"><mat-icon>download</mat-icon></button>
+      <button mat-icon-button (click)="uploadTaskResourcesZip()"><mat-icon>upload_file</mat-icon></button>
       <span class="flex-grow"></span>
-      <mat-paginator class="mat-elevation-z0" [pageSizeOptions]="[5, 10, 25, 100]"></mat-paginator>
+      <button mat-raised-button color="primary" (click)="createTaskDefinition()">Add Task</button>
     </span>
     <f-task-definition-editor
       *ngIf="selectedTaskDefinition"