diff --git a/src/app/editor/gamesystem-editor/scriptaccount-condition-editor/scriptaccount-condition-editor.component.html b/src/app/editor/gamesystem-editor/scriptaccount-condition-editor/scriptaccount-condition-editor.component.html
index 530a0fa..0ddb8f5 100644
--- a/src/app/editor/gamesystem-editor/scriptaccount-condition-editor/scriptaccount-condition-editor.component.html
+++ b/src/app/editor/gamesystem-editor/scriptaccount-condition-editor/scriptaccount-condition-editor.component.html
@@ -37,8 +37,8 @@
   <ng-container matColumnDef="edit">
     <th mat-header-cell *matHeaderCellDef></th>
     <td mat-cell *matCellDef="let condition;">
-      <button mat-icon-button color="primary" *ngIf="editedCondition == undefined" (click)="edit(condition)"><mat-icon>edit</mat-icon></button>
-      <button mat-icon-button color="primary" *ngIf="editedCondition === condition" (click)="finishEditing()"><mat-icon>done</mat-icon></button>
+      <button mat-icon-button class="icon-btn-primary" *ngIf="editedCondition == undefined" (click)="edit(condition)"><mat-icon>edit</mat-icon></button>
+      <button mat-icon-button class="icon-btn-primary" *ngIf="editedCondition === condition" (click)="finishEditing()"><mat-icon>done</mat-icon></button>
     </td>
   </ng-container>
 
diff --git a/src/app/editor/gamesystem-editor/state-editor/simple-state-editor/simple-state-editor.component.html b/src/app/editor/gamesystem-editor/state-editor/simple-state-editor/simple-state-editor.component.html
index 2153f0e..470471a 100644
--- a/src/app/editor/gamesystem-editor/state-editor/simple-state-editor/simple-state-editor.component.html
+++ b/src/app/editor/gamesystem-editor/state-editor/simple-state-editor/simple-state-editor.component.html
@@ -51,8 +51,8 @@
       <ng-container matColumnDef="edit">
         <th mat-header-cell *matHeaderCellDef></th>
         <td mat-cell *matCellDef="let state">
-          <button mat-icon-button color="primary" *ngIf="editedElement !== state" (click)="editState(state)" [disabled]="editedElement !== null"><mat-icon>edit</mat-icon></button>
-          <button mat-icon-button color="primary" (click)="finishEditing()" *ngIf="editedElement === state"><mat-icon>done</mat-icon></button>
+          <button mat-icon-button class="icon-btn-primary" *ngIf="editedElement !== state" (click)="editState(state)" [disabled]="editedElement !== null"><mat-icon>edit</mat-icon></button>
+          <button mat-icon-button class="icon-btn-primary" (click)="finishEditing()" *ngIf="editedElement === state"><mat-icon>done</mat-icon></button>
         </td>
       </ng-container>
 
diff --git a/src/app/editor/gamesystem-editor/state-editor/simple-state-editor/simple-state-editor.component.scss b/src/app/editor/gamesystem-editor/state-editor/simple-state-editor/simple-state-editor.component.scss
index 0830e19..f4b8648 100644
--- a/src/app/editor/gamesystem-editor/state-editor/simple-state-editor/simple-state-editor.component.scss
+++ b/src/app/editor/gamesystem-editor/state-editor/simple-state-editor/simple-state-editor.component.scss
@@ -17,12 +17,6 @@ tr.example-element-row:not(.example-expanded-row):active {
 .example-element-row td {
   border-bottom-width: 0;
 }
-
-.example-element-detail {
-  overflow: hidden;
-  display: flex;
-}
-
 .example-element-diagram {
   min-width: 80px;
   border: 2px solid black;
diff --git a/src/app/editor/gamesystem-editor/transition-editor/scriptaccount-action-editor/scriptaccount-action-editor.component.html b/src/app/editor/gamesystem-editor/transition-editor/scriptaccount-action-editor/scriptaccount-action-editor.component.html
index af7af1b..ea3882f 100644
--- a/src/app/editor/gamesystem-editor/transition-editor/scriptaccount-action-editor/scriptaccount-action-editor.component.html
+++ b/src/app/editor/gamesystem-editor/transition-editor/scriptaccount-action-editor/scriptaccount-action-editor.component.html
@@ -26,8 +26,8 @@
   <ng-container matColumnDef="edit">
     <th mat-header-cell *matHeaderCellDef></th>
     <td mat-cell *matCellDef="let action">
-      <button mat-icon-button color="primary" (click)="editAction(action)" [disabled]="addedAction != undefined || editedAction != undefined" *ngIf="action !== editedAction && action !== addedAction"><mat-icon>edit</mat-icon></button>
-      <button mat-icon-button color="primary" *ngIf="action === editedAction || action === addedAction" (click)="finishEditing()"><mat-icon>done</mat-icon></button>
+      <button mat-icon-button class="icon-btn-primary" (click)="editAction(action)" [disabled]="addedAction != undefined || editedAction != undefined" *ngIf="action !== editedAction && action !== addedAction"><mat-icon>edit</mat-icon></button>
+      <button mat-icon-button class="icon-btn-primary" *ngIf="action === editedAction || action === addedAction" (click)="finishEditing()"><mat-icon>done</mat-icon></button>
     </td>
   </ng-container>
 
diff --git a/src/app/editor/gamesystem-editor/transition-editor/simple-transition-editor/simple-transition-editor.component.html b/src/app/editor/gamesystem-editor/transition-editor/simple-transition-editor/simple-transition-editor.component.html
index e589f6f..6d61627 100644
--- a/src/app/editor/gamesystem-editor/transition-editor/simple-transition-editor/simple-transition-editor.component.html
+++ b/src/app/editor/gamesystem-editor/transition-editor/simple-transition-editor/simple-transition-editor.component.html
@@ -58,8 +58,8 @@
       <ng-container matColumnDef="edit">
         <th mat-header-cell *matHeaderCellDef></th>
         <td mat-cell *matCellDef="let transition">
-          <button mat-icon-button color="primary" *ngIf="editedTransition !== transition" [disabled]="editedTransition != undefined"><mat-icon>edit</mat-icon></button>
-          <button mat-icon-button color="primary" *ngIf="editedTransition === transition"
+          <button mat-icon-button class="icon-btn-primary" *ngIf="editedTransition !== transition" [disabled]="editedTransition != undefined"><mat-icon>edit</mat-icon></button>
+          <button mat-icon-button class="icon-btn-primary" *ngIf="editedTransition === transition"
                   [disabled]="transitionError || transitionStartingStateError || transitionEndingStateError" (click)="finishEditing()"
           ><mat-icon>done</mat-icon></button>
         </td>
diff --git a/src/styles.css b/src/styles.css
index 2fd855a..4f3f4b3 100644
--- a/src/styles.css
+++ b/src/styles.css
@@ -17,3 +17,7 @@ body { margin: 0; font-family: Roboto, "Helvetica Neue", sans-serif; }
   background-color: #4f5459 !important;
   color: white;
 }
+
+.icon-btn-primary {
+  color: #3c95f8;
+}
diff --git a/testModel/gamesystems/Weather.json b/testModel/gamesystems/Weather.json
new file mode 100644
index 0000000..53d81f8
--- /dev/null
+++ b/testModel/gamesystems/Weather.json
@@ -0,0 +1,13 @@
+{
+    "componentName": "Weather",
+    "componentDescription": "",
+    "states": [
+        {
+            "initial": false,
+            "conditions": [],
+            "stateLabel": "Sonnig",
+            "stateDescription": "Die Sonne scheint"
+        }
+    ],
+    "transitions": []
+}
\ No newline at end of file
diff --git a/testModel/script-accounts/Luftfeuchtigkeit.json b/testModel/script-accounts/Luftfeuchtigkeit.json
index b948f4b..b4593b2 100644
--- a/testModel/script-accounts/Luftfeuchtigkeit.json
+++ b/testModel/script-accounts/Luftfeuchtigkeit.json
@@ -1,8 +1,6 @@
 {
-    "unsaved": false,
     "componentName": "Luftfeuchtigkeit",
     "componentDescription": "",
-    "type": 0,
     "minValue": 0,
     "maxValue": 100
 }
\ No newline at end of file
diff --git a/testModel/script-accounts/Temperature.json b/testModel/script-accounts/Temperature.json
index c53736b..686f64e 100644
--- a/testModel/script-accounts/Temperature.json
+++ b/testModel/script-accounts/Temperature.json
@@ -1,8 +1,6 @@
 {
-    "unsaved": false,
     "componentName": "Temperature",
     "componentDescription": "",
-    "type": 0,
     "minValue": 0,
     "maxValue": 100
 }
\ No newline at end of file