diff --git a/static/src/app/statistic/war-detail/scoreboard/scoreboard.component.html b/static/src/app/statistic/war-detail/scoreboard/scoreboard.component.html
index 7f80d9b..5284f6e 100644
--- a/static/src/app/statistic/war-detail/scoreboard/scoreboard.component.html
+++ b/static/src/app/statistic/war-detail/scoreboard/scoreboard.component.html
@@ -10,7 +10,7 @@
     [columnMode]="'force'"
     [scrollbarV]="true"
     [selectionType]="'single'">
-    <ngx-datatable-column name="{{tableHead[0]}}" prop="name" [width]="210" style="padding-left:10px">
+    <ngx-datatable-column name="{{tableHead[0].head}}" prop="name" [width]="210" style="padding-left:10px">
       <ng-template ngx-datatable-cell-template let-row="row" let-value="value">
         <span class="player-name"
               [style.color]="row['fraction'] === 'BLUFOR' ? fraction.COLOR_BLUFOR : fraction.COLOR_OPFOR">
@@ -18,92 +18,24 @@
         </span>
       </ng-template>
     </ngx-datatable-column>
-    <ngx-datatable-column name="{{tableHead[1]}}" prop="fraction" [width]="90">
+    <ngx-datatable-column name="{{tableHead[1].head}}" prop="fraction" [width]="90">
       <ng-template ngx-datatable-cell-template let-value="value">
         {{value === 'BLUFOR' ? fraction.BLUFOR : fraction.OPFOR}}
       </ng-template>
     </ngx-datatable-column>
-    <ngx-datatable-column [width]="columnWidth" prop="kill">
-      <ng-template ngx-datatable-header-template let-sort="sortFn">
+
+    <div *ngFor="let column of tableHead.slice(2, tableHead.length-1) ">
+      <ngx-datatable-column [width]="columnWidth" prop="{{column.prop}}">
+        <ng-template ngx-datatable-header-template let-sort="sortFn">
         <span class="datatable-header-cell-wrapper">
-          <span class="datatable-header-cell-label text-truncate" title="{{tableHead[2]}}" (click)="sort()">
-            <img src="../../../../assets/tank.png">
+          <span class="datatable-header-cell-label text-truncate" title="{{column.head}}" (click)="sort()">
+            <img src="../../../../assets/scoreboard/{{column.prop}}.png">
           </span>
         </span>
-      </ng-template>
-    </ngx-datatable-column>
-    <ngx-datatable-column [width]="columnWidth" prop="friendlyFire">
-      <ng-template ngx-datatable-header-template let-sort="sortFn">
-        <span class="datatable-header-cell-wrapper">
-          <span class="datatable-header-cell-label text-truncate" title="{{tableHead[3]}}" (click)="sort()">
-            <img src="../../../../assets/tank.png">
-          </span>
-        </span>
-      </ng-template>
-    </ngx-datatable-column>
-    <ngx-datatable-column [width]="columnWidth" prop="vehicleLight">
-      <ng-template ngx-datatable-header-template let-sort="sortFn">
-        <span class="datatable-header-cell-wrapper">
-          <span class="datatable-header-cell-label text-truncate" title="{{tableHead[4]}}" (click)="sort()">
-            <img src="../../../../assets/scoreboard/vlight.png">
-          </span>
-        </span>
-      </ng-template>
-    </ngx-datatable-column>
-    <ngx-datatable-column [width]="columnWidth" prop="vehicleHeavy">
-      <ng-template ngx-datatable-header-template let-sort="sortFn">
-        <span class="datatable-header-cell-wrapper">
-          <span class="datatable-header-cell-label text-truncate" title="{{tableHead[5]}}" (click)="sort()">
-            <img src="../../../../assets/scoreboard/vheavy.png">
-          </span>
-        </span>
-      </ng-template>
-    </ngx-datatable-column>
-    <ngx-datatable-column [width]="columnWidth" prop="vehicleAir">
-      <ng-template ngx-datatable-header-template let-sort="sortFn">
-        <span class="datatable-header-cell-wrapper">
-          <span class="datatable-header-cell-label text-truncate" title="{{tableHead[6]}}" (click)="sort()">
-            <img src="../../../../assets/scoreboard/vair.png">
-          </span>
-        </span>
-      </ng-template>
-    </ngx-datatable-column>
-    <ngx-datatable-column [width]="columnWidth" prop="revive">
-      <ng-template ngx-datatable-header-template let-sort="sortFn">
-        <span class="datatable-header-cell-wrapper">
-          <span class="datatable-header-cell-label text-truncate" title="{{tableHead[7]}}" (click)="sort()">
-            <img src="../../../../assets/tank.png">
-          </span>
-        </span>
-      </ng-template>
-    </ngx-datatable-column>
-    <ngx-datatable-column [width]="columnWidth" prop="flagTouch">
-      <ng-template ngx-datatable-header-template let-sort="sortFn">
-        <span class="datatable-header-cell-wrapper">
-          <span class="datatable-header-cell-label text-truncate" title="{{tableHead[8]}}" (click)="sort()">
-            <img src="../../../../assets/tank.png">
-          </span>
-        </span>
-      </ng-template>
-    </ngx-datatable-column>
-    <ngx-datatable-column [width]="columnWidth" prop="death">
-      <ng-template ngx-datatable-header-template let-sort="sortFn">
-        <span class="datatable-header-cell-wrapper">
-          <span class="datatable-header-cell-label text-truncate" title="{{tableHead[9]}}" (click)="sort()">
-            <img src="../../../../assets/tank.png">
-          </span>
-        </span>
-      </ng-template>
-    </ngx-datatable-column>
-    <ngx-datatable-column [width]="columnWidth" prop="respawn">
-      <ng-template ngx-datatable-header-template let-sort="sortFn">
-        <span class="datatable-header-cell-wrapper">
-          <span class="datatable-header-cell-label text-truncate" title="{{tableHead[10]}}" (click)="sort()">
-            <img src="../../../../assets/tank.png">
-          </span>
-        </span>
-      </ng-template>
-    </ngx-datatable-column>
+        </ng-template>
+      </ngx-datatable-column>
+    </div>
+
     <!--<ngx-datatable-column [width]="80" name="" prop="name">-->
     <!--<ng-template ngx-datatable-cell-template let-value="value">-->
     <!--<span class="btn btn-sm btn-default in-table-btn disabled">Detail</span>-->
diff --git a/static/src/app/statistic/war-detail/scoreboard/scoreboard.component.ts b/static/src/app/statistic/war-detail/scoreboard/scoreboard.component.ts
index 316a561..0ced99b 100644
--- a/static/src/app/statistic/war-detail/scoreboard/scoreboard.component.ts
+++ b/static/src/app/statistic/war-detail/scoreboard/scoreboard.component.ts
@@ -19,8 +19,13 @@ export class ScoreboardComponent implements OnChanges {
 
   @Output() playerTabSwitch = new EventEmitter();
 
-  tableHead = ['Spieler', 'Fraktion', 'Kills', 'FF', 'Fzg(L)', 'Fzg(H)', 'Fzg(A)',
-    'Revive', 'Flagge', 'Tod', 'Respawn'];
+  tableHead = [
+    {prop: 'name', head: 'Spieler'}, {prop: 'fraction', head: 'Fraktion'}, {prop: 'kill', head: 'Kills'},
+    {prop: 'friendlyFire', head: 'FriendlyFire'}, {prop: 'vehicleLight', head: 'Fahrzeug (leicht)'},
+    {prop: 'vehicleHeavy', head: 'Fahrzeug (schwer)'}, {prop: 'vehicleAir', head: 'Fahrzeug (Luft)'},
+    {prop: 'revive', head: 'Revive'}, {prop: 'flagTouch', head: 'Flagge'}, {prop: 'death', head: 'Tod'},
+    {prop: 'respawn', head: 'Respawn'}
+  ];
 
   isSteamUUID = PlayerUtils.isSteamUUID;
 
diff --git a/static/src/assets/scoreboard/vair.png b/static/src/assets/scoreboard/vehicleAir.png
similarity index 100%
rename from static/src/assets/scoreboard/vair.png
rename to static/src/assets/scoreboard/vehicleAir.png
diff --git a/static/src/assets/scoreboard/vehicleHeavy.png b/static/src/assets/scoreboard/vehicleHeavy.png
new file mode 100644
index 0000000..f0ec30c
Binary files /dev/null and b/static/src/assets/scoreboard/vehicleHeavy.png differ
diff --git a/static/src/assets/scoreboard/vlight.png b/static/src/assets/scoreboard/vehicleLight.png
similarity index 100%
rename from static/src/assets/scoreboard/vlight.png
rename to static/src/assets/scoreboard/vehicleLight.png
diff --git a/static/src/assets/scoreboard/vheavy.png b/static/src/assets/scoreboard/vheavy.png
deleted file mode 100644
index 91412df..0000000
Binary files a/static/src/assets/scoreboard/vheavy.png and /dev/null differ