diff --git a/src/app/api/models/task-definition.ts b/src/app/api/models/task-definition.ts
index 1b49a2e85..8e9ed910b 100644
--- a/src/app/api/models/task-definition.ts
+++ b/src/app/api/models/task-definition.ts
@@ -1,14 +1,20 @@
-import { HttpClient } from '@angular/common/http';
-import { Entity, EntityMapping } from 'ngx-entity-service';
-import { Observable, tap } from 'rxjs';
-import { AppInjector } from 'src/app/app-injector';
-import { DoubtfireConstants } from 'src/app/config/constants/doubtfire-constants';
-import { Grade, GroupSet, TutorialStream, Unit } from './doubtfire-model';
-import { TaskDefinitionService } from '../services/task-definition.service';
-
-export type UploadRequirement = { key: string; name: string; type: string; tiiCheck?: boolean; tiiPct?: number };
+import {HttpClient, HttpResponse} from '@angular/common/http';
+import {Entity, EntityMapping} from 'ngx-entity-service';
+import {firstValueFrom, Observable, tap} from 'rxjs';
+import {AppInjector} from 'src/app/app-injector';
+import {DoubtfireConstants} from 'src/app/config/constants/doubtfire-constants';
+import {Grade, GroupSet, TutorialStream, Unit} from './doubtfire-model';
+import {TaskDefinitionService} from '../services/task-definition.service';
+
+export type UploadRequirement = {
+  key: string;
+  name: string;
+  type: string;
+  tiiCheck?: boolean;
+  tiiPct?: number;
+};
 
-export type SimilarityCheck = { key: string; type: string; pattern: string };
+export type SimilarityCheck = {key: string; type: string; pattern: string};
 
 export class TaskDefinition extends Entity {
   id: number;
@@ -36,7 +42,7 @@ export class TaskDefinition extends Entity {
   maxQualityPts: number;
   overseerImageId: number;
   assessmentEnabled: boolean;
-  mossLanguage: string = 'moss c';
+  jplagLanguage: string = 'c';
 
   readonly unit: Unit;
 
@@ -67,7 +73,7 @@ export class TaskDefinition extends Entity {
           entity: this,
           cache: this.unit.taskDefinitionCache,
           constructorParams: this.unit,
-        }
+        },
       );
     } else {
       return svc.update(
@@ -75,7 +81,7 @@ export class TaskDefinition extends Entity {
           unitId: this.unit.id,
           id: this.id,
         },
-        { entity: this }
+        {entity: this},
       );
     }
   }
@@ -122,7 +128,10 @@ export class TaskDefinition extends Entity {
   }
 
   public matches(text: string): boolean {
-    return this.abbreviation.toLowerCase().indexOf(text) !== -1 || this.name.toLowerCase().indexOf(text) !== -1;
+    return (
+      this.abbreviation.toLowerCase().indexOf(text) !== -1 ||
+      this.name.toLowerCase().indexOf(text) !== -1
+    );
   }
 
   /**
@@ -160,7 +169,7 @@ export class TaskDefinition extends Entity {
     return this.plagiarismChecks?.length > 0;
   }
 
-  public get needsMoss(): boolean {
+  public get needsJplag(): boolean {
     return this.uploadRequirements.some((upreq) => upreq.type === 'code' && upreq.tiiCheck);
   }
 
@@ -188,6 +197,19 @@ export class TaskDefinition extends Entity {
     }/task_assessment_resources.json`;
   }
 
+  public async hasJplagReport(): Promise<boolean> {
+    const url = `${AppInjector.get(DoubtfireConstants).API_URL}/units/${this.unit.id}/task_definitions/${this.id}/has_jplag_report`;
+    //console.log(url);
+    try {
+      const response = await fetch(url);
+      const result = await response.json();
+      return result === 'true';
+    } catch (error) {
+      console.error('Error fetching JPLAG report:', error);
+      return false;
+    }
+  }
+
   public deleteTaskSheet(): Observable<any> {
     const httpClient = AppInjector.get(HttpClient);
     return httpClient.delete(this.taskSheetUploadUrl).pipe(tap(() => (this.hasTaskSheet = false)));
@@ -195,7 +217,9 @@ export class TaskDefinition extends Entity {
 
   public deleteTaskResources(): Observable<any> {
     const httpClient = AppInjector.get(HttpClient);
-    return httpClient.delete(this.taskResourcesUploadUrl).pipe(tap(() => (this.hasTaskResources = false)));
+    return httpClient
+      .delete(this.taskResourcesUploadUrl)
+      .pipe(tap(() => (this.hasTaskResources = false)));
   }
 
   public deleteTaskAssessmentResources(): Observable<any> {
diff --git a/src/app/api/models/task-similarity.ts b/src/app/api/models/task-similarity.ts
index c3a72e556..be8b3d9b0 100644
--- a/src/app/api/models/task-similarity.ts
+++ b/src/app/api/models/task-similarity.ts
@@ -5,7 +5,7 @@ import { DoubtfireConstants } from 'src/app/config/constants/doubtfire-constants
 import { Observable } from 'rxjs';
 
 export enum TaskSimilarityType {
-  Moss = 'MossTaskSimilarity',
+  Jplag = 'JplagTaskSimilarity',
   TurnItIn = 'TiiTaskSimilarity',
 }
 
@@ -62,8 +62,8 @@ export class TaskSimilarity extends Entity {
 
   public get friendlyTypeName(): string {
     switch (this.type) {
-      case TaskSimilarityType.Moss:
-        return 'MOSS';
+      case TaskSimilarityType.Jplag:
+        return 'JPLAG';
       case TaskSimilarityType.TurnItIn:
         return 'TurnItIn';
     }
diff --git a/src/app/api/services/task-definition.service.ts b/src/app/api/services/task-definition.service.ts
index 13a1dd279..e0b685c20 100644
--- a/src/app/api/services/task-definition.service.ts
+++ b/src/app/api/services/task-definition.service.ts
@@ -21,7 +21,7 @@ export class TaskDefinitionService extends CachedEntityService<TaskDefinition> {
       'description',
       'weighting',
       'targetGrade',
-      'mossLanguage',
+      'jplagLanguage',
       {
         keys: 'targetDate',
         toEntityFn: MappingFunctions.mapDateToEndOfDay,
diff --git a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-similarity-view/task-similarity-view.component.html b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-similarity-view/task-similarity-view.component.html
index f068cb609..2f42a7974 100644
--- a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-similarity-view/task-similarity-view.component.html
+++ b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-similarity-view/task-similarity-view.component.html
@@ -23,14 +23,25 @@ <h1 class="mat-headline"></h1>
             </mat-panel-title>
             <mat-panel-description> {{ part.description }} </mat-panel-description>
             @if (similarity.readyForViewer) {
-              <button
-                matTooltip="View report for this similarity"
-                mat-icon-button
-                aria-label="View Detailed Report"
-                (click)="openReport($event, similarity)"
-              >
-                <mat-icon>summarize</mat-icon>
-              </button>
+              @if (similarity.type === 'JplagTaskSimilarity') {
+                <button
+                  matTooltip="Download report for this similarity"
+                  mat-icon-button
+                  aria-label="View Detailed Report"
+                  (click)="downloadJPLAGReport()"
+                >
+                  <mat-icon>download</mat-icon>
+                </button>
+              } @else {
+                <button
+                  matTooltip="View similarity for this part"
+                  mat-icon-button
+                  aria-label="View Similarity"
+                  (click)="openViewer($event, similarity, part)"
+                >
+                  <mat-icon>summarize</mat-icon>
+                </button>
+              }
             }
             @if (i === 0) {
               <button
diff --git a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-similarity-view/task-similarity-view.component.ts b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-similarity-view/task-similarity-view.component.ts
index 2a6739207..272b456af 100644
--- a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-similarity-view/task-similarity-view.component.ts
+++ b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-similarity-view/task-similarity-view.component.ts
@@ -5,6 +5,9 @@ import { TaskSimilarity } from 'src/app/api/models/task-similarity';
 import { TaskSimilarityService } from 'src/app/api/services/task-similarity.service';
 import { AlertService } from 'src/app/common/services/alert.service';
 import { SelectedTaskService } from '../../../../selected-task.service';
+import {FileDownloaderService} from 'src/app/common/file-downloader/file-downloader.service';
+import { DoubtfireConstants } from 'src/app/config/constants/doubtfire-constants';
+import { AppInjector } from 'src/app/app-injector';
 
 @Component({
   selector: 'f-task-similarity-view',
@@ -19,7 +22,8 @@ export class TaskSimilarityViewComponent implements OnChanges {
   constructor(
     private taskSimilarityService: TaskSimilarityService,
     private alertsService: AlertService,
-    private selectedTaskService: SelectedTaskService
+    private selectedTaskService: SelectedTaskService,
+    private fileDownloaderService: FileDownloaderService,
   ) {}
 
   ngOnChanges(changes: SimpleChanges) {
@@ -54,4 +58,16 @@ export class TaskSimilarityViewComponent implements OnChanges {
       window.open(url, '_blank');
     });
   }
+
+  downloadJPLAGReport() {
+    const taskDef = this.task.definition;
+    this.fileDownloaderService.downloadFile(
+      //this.taskData.selectedTask.jplagReportUrl()
+      `${AppInjector.get(DoubtfireConstants).API_URL}/units/${
+        this.task.unit.id
+      }/task_definitions/${taskDef.id}/jplag_report`,
+      `${this.task.unit.code}-${taskDef.abbreviation}-jplag-report.zip`,
+    );
+    window.open('https://jplag.github.io/JPlag/', '_blank');
+  }
 }
diff --git a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-upload/task-definition-upload.component.html b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-upload/task-definition-upload.component.html
index fe96cfb2d..fdd804b8c 100644
--- a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-upload/task-definition-upload.component.html
+++ b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-upload/task-definition-upload.component.html
@@ -29,7 +29,7 @@
 <mat-checkbox [(ngModel)]="upreq.tiiCheck">TurnItIn</mat-checkbox>
 }
       @if (upreq.type === 'code') {
-<mat-checkbox [(ngModel)]="upreq.tiiCheck">Moss</mat-checkbox>
+<mat-checkbox [(ngModel)]="upreq.tiiCheck">Jplag</mat-checkbox>
 }
     </td>
   </ng-container>
@@ -74,19 +74,19 @@
   <tr mat-footer-row *matFooterRowDef="['actions']"></tr>
 </table>
 
-@if (taskDefinition.needsMoss) {
+@if (taskDefinition.needsJplag) {
 <div class="flex-grow flex flex-row gap-4">
   <mat-form-field appearance="outline" class="basis-1/2">
-    <mat-label>Language used for Moss checks</mat-label>
-    <mat-select [(ngModel)]="taskDefinition.mossLanguage">
-      <mat-option value="moss c">C</mat-option>
-      <mat-option value="moss csharp">C#</mat-option>
-      <mat-option value="moss cc">C++</mat-option>
-      <mat-option value="moss python">Python</mat-option>
+    <mat-label>Language used for JPLAG checks</mat-label>
+    <mat-select [(ngModel)]="taskDefinition.jplagLanguage">
+      <mat-option value="c">C</mat-option>
+      <mat-option value="csharp">C#</mat-option>
+      <mat-option value="cpp">C++</mat-option>
+      <mat-option value="python">Python</mat-option>
     </mat-select>
   </mat-form-field>
   <mat-form-field appearance="outline" class="basis-1/2">
-    <mat-label>Similarity percent to flag for Moss checks</mat-label>
+    <mat-label>Similarity percent to flag for JPLAG checks</mat-label>
     <input matInput [(ngModel)]="taskDefinition.plagiarismWarnPct" type="number" />
   </mat-form-field>
 </div>
diff --git a/src/app/units/states/tasks/inbox/directives/staff-task-list/staff-task-list.component.html b/src/app/units/states/tasks/inbox/directives/staff-task-list/staff-task-list.component.html
index bb9c9ba8c..0752b1a52 100644
--- a/src/app/units/states/tasks/inbox/directives/staff-task-list/staff-task-list.component.html
+++ b/src/app/units/states/tasks/inbox/directives/staff-task-list/staff-task-list.component.html
@@ -1,6 +1,9 @@
 <!-- The search bar template -->
 <ng-template #OmnisearchTemplate let-collapsable="collapsable" let-mobile="mobile">
-  <div class="omnisearch rounded-t-2xl md:rounded-2xl" [ngClass]="{ expanded: showSearchOptions, mobile: mobile }">
+  <div
+    class="omnisearch rounded-t-2xl md:rounded-2xl"
+    [ngClass]="{expanded: showSearchOptions, mobile: mobile}"
+  >
     <div class="flex items-center">
       <button mat-icon-button aria-label="Search Icon" disabled class="flex-none flex items-center">
         <mat-icon class="flex items-center" disabled>search</mat-icon>
@@ -18,42 +21,44 @@
         />
       </div>
       @if (collapsable) {
-      <button
-        class="flex-none flex items-center"
-        matTooltip="Filter options"
-        matTooltipPosition="below"
-        matTooltipShowDelay="400"
-        mat-icon-button
-        aria-label="Inbox search dropdown"
-        (click)="showSearchOptions = !showSearchOptions"
-      >
-        <mat-icon>{{ showSearchOptions ? 'arrow_drop_up' : 'arrow_drop_down' }}</mat-icon>
-      </button>
-      } @if (!isTaskDefMode) {
-      <button
-        class="flex-none flex items-center"
-        matTooltip="Refresh the task inbox"
-        matTooltipPosition="below"
-        matTooltipShowDelay="400"
-        matTooltip
-        mat-icon-button
-        aria-label="Refresh Inbox"
-        (click)="refreshTasks()"
-      >
-        <mat-icon>refresh</mat-icon>
-      </button>
-      } @if (isTaskDefMode) {
-      <button
-        class="flex items-center"
-        mat-icon-button
-        matTooltip="More options"
-        matTooltipPosition="below"
-        matTooltipShowDelay="400"
-        [matMenuTriggerFor]="menu"
-        aria-label="Menu to download submission files"
-      >
-        <mat-icon>more_vert</mat-icon>
-      </button>
+        <button
+          class="flex-none flex items-center"
+          matTooltip="Filter options"
+          matTooltipPosition="below"
+          matTooltipShowDelay="400"
+          mat-icon-button
+          aria-label="Inbox search dropdown"
+          (click)="showSearchOptions = !showSearchOptions"
+        >
+          <mat-icon>{{ showSearchOptions ? 'arrow_drop_up' : 'arrow_drop_down' }}</mat-icon>
+        </button>
+      }
+      @if (!isTaskDefMode) {
+        <button
+          class="flex-none flex items-center"
+          matTooltip="Refresh the task inbox"
+          matTooltipPosition="below"
+          matTooltipShowDelay="400"
+          matTooltip
+          mat-icon-button
+          aria-label="Refresh Inbox"
+          (click)="refreshTasks()"
+        >
+          <mat-icon>refresh</mat-icon>
+        </button>
+      }
+      @if (isTaskDefMode) {
+        <button
+          class="flex items-center"
+          mat-icon-button
+          matTooltip="More options"
+          matTooltipPosition="below"
+          matTooltipShowDelay="400"
+          [matMenuTriggerFor]="menu"
+          aria-label="Menu to download submission files"
+        >
+          <mat-icon>more_vert</mat-icon>
+        </button>
       }
       <mat-menu #menu="matMenu">
         <button
@@ -74,6 +79,11 @@
           <mat-icon>download</mat-icon>
           <span>Bulk Export Submission Files</span>
         </button>
+        <!-- Commented out until hasJplagReport check works correctly -->
+        <!-- <button mat-menu-item (click)="downloadJPLAGReport()" [disabled]="hasJplagReport">
+          <mat-icon>download</mat-icon>
+          <span>Download JPLAG Report</span>
+        </button> -->
       </mat-menu>
     </div>
     <mat-accordion>
@@ -93,16 +103,20 @@
                   name="taskDefID"
                   (selectionChange)="taskDefinitionIdChanged()"
                 >
-                  <mat-option value="" [hidden]="taskData.taskDefMode">All Task Definitions</mat-option>
+                  <mat-option value="" [hidden]="taskData.taskDefMode"
+                    >All Task Definitions</mat-option
+                  >
                   @for (td of unit.taskDefinitionCache.values | async; track td) {
-                  <mat-option [value]="td.id">
-                    <span class="truncate">{{ td.abbreviation + ' - ' + td.name }}</span>
-                  </mat-option>
+                    <mat-option [value]="td.id">
+                      <span class="truncate">{{ td.abbreviation + ' - ' + td.name }}</span>
+                    </mat-option>
                   }
                 </mat-select>
               </mat-form-field>
               <button
-                [disabled]="filters.taskDefinitionIdSelected || !filters.taskDefinitionIdSelected === ''"
+                [disabled]="
+                  filters.taskDefinitionIdSelected || !filters.taskDefinitionIdSelected === ''
+                "
                 mat-icon-button
                 aria-label="Sort by task definition icon"
                 (click)="toggleTaskDefSort()"
@@ -121,13 +135,18 @@
                 (selectionChange)="tutorialIdChanged()"
               >
                 @for (t of studentFilter; track t) {
-                <mat-option [value]="t.id">
-                  <span class="truncate">{{ t.inboxDescription }}</span>
-                </mat-option>
+                  <mat-option [value]="t.id">
+                    <span class="truncate">{{ t.inboxDescription }}</span>
+                  </mat-option>
                 }
               </mat-select>
             </mat-form-field>
-            <button disabled mat-icon-button aria-label="Sort by tutorial icon" (click)="toggleTutorialSort()">
+            <button
+              disabled
+              mat-icon-button
+              aria-label="Sort by tutorial icon"
+              (click)="toggleTutorialSort()"
+            >
               <mat-icon>{{ states[tutorialSort].icon }}</mat-icon>
             </button>
           </div>
@@ -140,14 +159,19 @@
 
 <!-- Narrow width search dialog template-->
 <ng-template #searchDialog>
-  <ng-container *ngTemplateOutlet="OmnisearchTemplate; context: { collapsable: false, mobile: true }"></ng-container>
+  <ng-container
+    *ngTemplateOutlet="OmnisearchTemplate; context: {collapsable: false, mobile: true}"
+  ></ng-container>
   <div mat-dialog-actions align="end">
     <button mat-button [mat-dialog-close]>OK</button>
   </div>
 </ng-template>
 
 <!-- Actual task-inbox -->
-<div class="task-inbox flex flex-col justify-normal" [ngClass]="isNarrow ? 'narrow-width' : 'full-width'">
+<div
+  class="task-inbox flex flex-col justify-normal"
+  [ngClass]="isNarrow ? 'narrow-width' : 'full-width'"
+>
   <div class="openSearchDialog" [hidden]="!isNarrow">
     <button mat-icon-button (click)="openDialog()" aria-label="Seach Button">
       <mat-icon>search</mat-icon>
@@ -155,9 +179,11 @@
   </div>
 
   @if (!isNarrow) {
-  <div>
-    <ng-container *ngTemplateOutlet="OmnisearchTemplate; context: { collapsable: true, mobile: false }"></ng-container>
-  </div>
+    <div>
+      <ng-container
+        *ngTemplateOutlet="OmnisearchTemplate; context: {collapsable: true, mobile: false}"
+      ></ng-container>
+    </div>
   }
 
   <div class="center-task-list" [hidden]="!loading || isNarrow">
@@ -170,44 +196,45 @@
 
   <!--/search-options-->
   @if (filteredTasks) {
-  <cdk-virtual-scroll-viewport class="tasks-viewport scrollable" itemSize="60">
-    <mat-list class="m-0 p-0">
-      <mat-list-item
-        class="clearfix"
-        *cdkVirtualFor="let task of filteredTasks; templateCacheSize: 0"
-        style="padding: 0; height: 60px"
-      >
-        @if (task) {
-        <div
-          class="w-full"
-          id="{{ task.taskKeyToIdString() }}"
-          [ngClass]="{
-            selected: isSelectedTask(task),
-            'item-content': task.statusClass()
-          }"
+    <cdk-virtual-scroll-viewport class="tasks-viewport scrollable" itemSize="60">
+      <mat-list class="m-0 p-0">
+        <mat-list-item
+          class="clearfix"
+          *cdkVirtualFor="let task of filteredTasks; templateCacheSize: 0"
+          style="padding: 0; height: 60px"
         >
-          <div
-            (click)="setSelectedTask(task)"
-            class="inbox-entry flex items-center"
-            [ngClass]="{ hover: task.hover }"
-            (mouseover)="task.hover = allowHover"
-            (mouseout)="task.hover = task.optionsOpened"
-          >
-            <span
-              class="notification"
+          @if (task) {
+            <div
+              class="w-full"
+              id="{{ task.taskKeyToIdString() }}"
               [ngClass]="{
-                active: task.numNewComments > 0 || task.similaritiesDetected,
-                similarities: task.similaritiesDetected
+                selected: isSelectedTask(task),
+                'item-content': task.statusClass(),
               }"
-            ></span>
-            <user-icon class="self-center" [user]="task.project.student" [size]="30"> </user-icon>
-            <div class="task-list-data truncate flex-1" [hidden]="isNarrow">
-              <h4 class="student-name">{{ task.project.student.name }}</h4>
-              <div class="task-details truncate">
-                {{ task.definition.abbreviation }} -
-                {{ task.definition.name }}
-              </div>
-              <!-- <div class="muted" [hidden]="!isSelectedTask(task)">
+            >
+              <div
+                (click)="setSelectedTask(task)"
+                class="inbox-entry flex items-center"
+                [ngClass]="{hover: task.hover}"
+                (mouseover)="task.hover = allowHover"
+                (mouseout)="task.hover = task.optionsOpened"
+              >
+                <span
+                  class="notification"
+                  [ngClass]="{
+                    active: task.numNewComments > 0 || task.similaritiesDetected,
+                    similarities: task.similaritiesDetected,
+                  }"
+                ></span>
+                <user-icon class="self-center" [user]="task.project.student" [size]="30">
+                </user-icon>
+                <div class="task-list-data truncate flex-1" [hidden]="isNarrow">
+                  <h4 class="student-name">{{ task.project.student.name }}</h4>
+                  <div class="task-details truncate">
+                    {{ task.definition.abbreviation }} -
+                    {{ task.definition.name }}
+                  </div>
+                  <!-- <div class="muted" [hidden]="!isSelectedTask(task)">
                 <p class="mat-small">
                   {{ task.shortTutorialDescription() }}
                 </p>
@@ -216,60 +243,66 @@ <h4 class="student-name">{{ task.project.student.name }}</h4>
                   Assessed {{ task.timesAssessed }} time{{ task.timesAssessed === 1 ? '' : 's' }}
                 </p>
               </div> -->
-            </div>
-            @if (task.hasGrade()) {
-            <div matTooltip="The grade assigned to the submission" matTooltipPosition="above">
-              <mat-chip-option style="margin-right: 6px" [hidden]="isNarrow">{{ task.gradeDesc() }} </mat-chip-option>
-            </div>
-            }
-            <status-icon
-              [hidden]="isNarrow"
-              matBadge="{{ task.qualityPts }}/{{ task.definition.maxQualityPts }}"
-              [matBadgeHidden]="!task.hasQualityPoints() || !task.qualityPts"
-              matBadgePosition="before"
-              [status]="task.status"
-              class="ml-3"
-            ></status-icon>
-            @if (!isTaskDefMode) {
-            <div class="overflow" [hidden]="isNarrow">
-              <button [hidden]="task.hover" mat-icon-button aria-label="task-overflow">
-                <!-- <mat-icon class="warn-icon" *ngIf="task.similaritiesDetected">remove_red_eye</mat-icon> -->
-
-                @if (task.pinned) {
-                <div class="pin-container">
-                  <mat-icon>push_pin</mat-icon>
                 </div>
+                @if (task.hasGrade()) {
+                  <div matTooltip="The grade assigned to the submission" matTooltipPosition="above">
+                    <mat-chip-option style="margin-right: 6px" [hidden]="isNarrow"
+                      >{{ task.gradeDesc() }}
+                    </mat-chip-option>
+                  </div>
                 }
-              </button>
-              <button
-                [hidden]="!task.hover"
-                mat-icon-button
-                aria-label="task overflow"
-                [matMenuTriggerFor]="overflowMenu"
-                (menuOpened)="setSelectedTask(task); task.optionsOpened = true"
-                (menuClosed)="task.hover = false; task.optionsOpened = false"
-                matTooltip="Submission options"
-                matTooltipPosition="right"
-                matTooltipShowDelay="400"
-              >
-                <mat-icon>more_horiz</mat-icon>
-              </button>
-              <mat-menu #overflowMenu="matMenu" yPosition="below">
-                <button mat-menu-item (click)="togglePin(task)" class="flex items-center">
-                  <mat-icon class="mr-0"> {{ task.pinned ? 'remove_circle' : 'add_alert' }} </mat-icon>
-                  <span class="ml-5">{{ task.pinned ? 'Unpin from inbox' : 'Pin to inbox' }} </span>
-                </button>
-              </mat-menu>
+                <status-icon
+                  [hidden]="isNarrow"
+                  matBadge="{{ task.qualityPts }}/{{ task.definition.maxQualityPts }}"
+                  [matBadgeHidden]="!task.hasQualityPoints() || !task.qualityPts"
+                  matBadgePosition="before"
+                  [status]="task.status"
+                  class="ml-3"
+                ></status-icon>
+                @if (!isTaskDefMode) {
+                  <div class="overflow" [hidden]="isNarrow">
+                    <button [hidden]="task.hover" mat-icon-button aria-label="task-overflow">
+                      <!-- <mat-icon class="warn-icon" *ngIf="task.similaritiesDetected">remove_red_eye</mat-icon> -->
+
+                      @if (task.pinned) {
+                        <div class="pin-container">
+                          <mat-icon>push_pin</mat-icon>
+                        </div>
+                      }
+                    </button>
+                    <button
+                      [hidden]="!task.hover"
+                      mat-icon-button
+                      aria-label="task overflow"
+                      [matMenuTriggerFor]="overflowMenu"
+                      (menuOpened)="setSelectedTask(task); task.optionsOpened = true"
+                      (menuClosed)="task.hover = false; task.optionsOpened = false"
+                      matTooltip="Submission options"
+                      matTooltipPosition="right"
+                      matTooltipShowDelay="400"
+                    >
+                      <mat-icon>more_horiz</mat-icon>
+                    </button>
+                    <mat-menu #overflowMenu="matMenu" yPosition="below">
+                      <button mat-menu-item (click)="togglePin(task)" class="flex items-center">
+                        <mat-icon class="mr-0">
+                          {{ task.pinned ? 'remove_circle' : 'add_alert' }}
+                        </mat-icon>
+                        <span class="ml-5"
+                          >{{ task.pinned ? 'Unpin from inbox' : 'Pin to inbox' }}
+                        </span>
+                      </button>
+                    </mat-menu>
+                  </div>
+                }
+              </div>
+              <!--/badges-->
             </div>
-            }
-          </div>
-          <!--/badges-->
-        </div>
-        }
-      </mat-list-item>
+          }
+        </mat-list-item>
 
-      <!--/task-->
-    </mat-list>
-  </cdk-virtual-scroll-viewport>
+        <!--/task-->
+      </mat-list>
+    </cdk-virtual-scroll-viewport>
   }
 </div>
diff --git a/src/app/units/states/tasks/inbox/directives/staff-task-list/staff-task-list.component.ts b/src/app/units/states/tasks/inbox/directives/staff-task-list/staff-task-list.component.ts
index 95b498af2..2b2c03286 100644
--- a/src/app/units/states/tasks/inbox/directives/staff-task-list/staff-task-list.component.ts
+++ b/src/app/units/states/tasks/inbox/directives/staff-task-list/staff-task-list.component.ts
@@ -77,6 +77,8 @@ export class StaffTaskListComponent implements OnInit, OnChanges, OnDestroy {
 
   tasks: any[] = null;
 
+  hasJplagReport: boolean;
+
   watchingTaskKey: any;
 
   panelOpenState = false;
@@ -206,6 +208,20 @@ export class StaffTaskListComponent implements OnInit, OnChanges, OnDestroy {
     return this.taskData.taskDefMode;
   }
 
+  // TODO: Get this to return correct value from the API
+  public async taskHasJplagReport(): Promise<boolean> {
+    const taskDef = this.filters.taskDefinition;
+    return taskDef
+      .hasJplagReport()
+      .then((hasReport) => {
+        return hasReport ?? false;
+      })
+      .catch((error) => {
+        console.error(error);
+        return false;
+      });
+  }
+
   downloadSubmissionPdfs() {
     const taskDef = this.filters.taskDefinition;
     this.fileDownloaderService.downloadFile(
@@ -226,6 +242,18 @@ export class StaffTaskListComponent implements OnInit, OnChanges, OnDestroy {
     );
   }
 
+  downloadJPLAGReport() {
+    const taskDef = this.filters.taskDefinition;
+    this.fileDownloaderService.downloadFile(
+      //this.taskData.selectedTask.jplagReportUrl()
+      `${AppInjector.get(DoubtfireConstants).API_URL}/units/${
+        this.unit.id
+      }/task_definitions/${taskDef.id}/jplag_report`,
+      `${this.unit.code}-${taskDef.abbreviation}-jplag-report.zip`,
+    );
+    window.open('https://jplag.github.io/JPlag/', '_blank');
+  }
+
   openDialog() {
     const dialogRef = this.dialog.open(this.searchDialog);
 
@@ -349,6 +377,10 @@ export class StaffTaskListComponent implements OnInit, OnChanges, OnDestroy {
         this.alertService.error(message, 6000);
       },
     });
+    this.taskHasJplagReport().then((hasReport) => {
+      this.hasJplagReport = hasReport;
+    });
+    console.log('HAS JPLAG REPORT:', this.hasJplagReport);
   }
 
   setSelectedTask(task: Task) {