diff --git a/static/src/app/decorations/decoration-list/decoration-item.component.html b/static/src/app/decorations/decoration-list/decoration-item.component.html
index fdfe55e..9f6986c 100644
--- a/static/src/app/decorations/decoration-list/decoration-item.component.html
+++ b/static/src/app/decorations/decoration-list/decoration-item.component.html
@@ -13,7 +13,11 @@
     </div>
 
     <div class="col-xs-3">
-      <img src="{{imageSrc}}" height="{{decoration.isMedal ? 50 : 20}}" [style.margin-top]="previewMargin" class="decoration-list-preview">
+      <img src="{{imageSrc}}"
+           [style.max-height]="imgStyle.height"
+           [style.max-width]="imgStyle.width"
+           [style.margin-top]="imgStyle.marginTop"
+           class="decoration-list-preview">
       <span (click)="delete(); $event.stopPropagation()" title="Löschen" class="glyphicon glyphicon-trash trash"></span>
     </div>
   </div>
diff --git a/static/src/app/decorations/decoration-list/decoration-item.component.ts b/static/src/app/decorations/decoration-list/decoration-item.component.ts
index 05bbe86..95165a9 100644
--- a/static/src/app/decorations/decoration-list/decoration-item.component.ts
+++ b/static/src/app/decorations/decoration-list/decoration-item.component.ts
@@ -15,7 +15,7 @@ export class DecorationItemComponent {
   selected: boolean;
   decoration: Decoration;
   imageSrc;
-  previewMargin;
+  imgStyle = {width: '', height: '', marginTop: ''};
 
   decorationSelected = new EventEmitter();
   decorationDelete = new EventEmitter();
@@ -26,7 +26,11 @@ export class DecorationItemComponent {
   ngOnInit() {
     this.imageSrc = 'resource/decoration/' + this.decoration._id + '.png?' + Date.now();
     if (!this.decoration.isMedal) {
-      this.previewMargin = '17px'
+      this.imgStyle.width = '62px';
+      this.imgStyle.marginTop = '17px'
+    } else {
+      this.imgStyle.height = '50px';
+      this.imgStyle.marginTop = '3px'
     }
   }
 
diff --git a/static/src/app/decorations/decoration-list/decoration-list.component.ts b/static/src/app/decorations/decoration-list/decoration-list.component.ts
index fae3837..24e61bb 100644
--- a/static/src/app/decorations/decoration-list/decoration-list.component.ts
+++ b/static/src/app/decorations/decoration-list/decoration-list.component.ts
@@ -58,7 +58,7 @@ export class DecorationListComponent implements OnInit {
   }
 
   deleteDecoration(decoration) {
-    let fraction = 'GLOBAL';
+    let fraction = 'Global';
     if (decoration.fraction === 'BLUFOR') fraction = 'NATO';
     else if (decoration.fraction === 'OPFOR') fraction = 'CSAT';