diff --git a/src/app/editor/editor.component.html b/src/app/editor/editor.component.html
index dc9bd38..046bdbf 100644
--- a/src/app/editor/editor.component.html
+++ b/src/app/editor/editor.component.html
@@ -1,7 +1,9 @@
 <mat-tab-group>
   <mat-tab *ngFor="let modelComponent of gameModelComponents">
     <ng-template mat-tab-label>
-      <mat-icon class="example-tab-icon unsaved" [ngClass]="modelComponent.unsaved? 'unsaved':'saved'">inventory_2</mat-icon>
+      <mat-icon class="example-tab-icon unsaved" *ngIf="modelComponent.type === ModelComponentType.SCRIPTACCOUNT" [ngClass]="modelComponent.unsaved? 'unsaved':'saved'">inventory_2</mat-icon>
+      <mat-icon class="example-tab-icon unsaved" *ngIf="modelComponent.type === ModelComponentType.GAMESYTEM" [ngClass]="modelComponent.unsaved? 'unsaved':'saved'">code</mat-icon>
+
       <span [ngClass]="modelComponent.unsaved? 'unsaved':'saved'">{{modelComponent.componentName}}</span>
       <button class="content-label close-btn" mat-icon-button (click)="closeGameModelComponent(modelComponent)"><mat-icon>close</mat-icon></button>
     </ng-template>
diff --git a/src/app/side-overviews/gamescript-overview/gamescript-overview.component.html b/src/app/side-overviews/gamescript-overview/gamescript-overview.component.html
index d8a0d79..d12b880 100644
--- a/src/app/side-overviews/gamescript-overview/gamescript-overview.component.html
+++ b/src/app/side-overviews/gamescript-overview/gamescript-overview.component.html
@@ -4,7 +4,10 @@
                  (click)="onSelectGamesystem(node)" (contextmenu)="onSelectGamesystem(node)" (dblclick)="openGamesystemEditor(node)">
     <!-- use a disabled button to provide padding for tree leaf -->
     <button mat-icon-button class="small-icon-button" [disabled]="true"></button>
-    {{node.name}}
+    <div>
+      <button mat-icon-button class="small-icon-button"><mat-icon>code</mat-icon></button>
+      <span>{{node.name}}</span>
+    </div>
   </mat-tree-node>
   <!-- This is the tree node template for expandable nodes -->
   <mat-tree-node *matTreeNodeDef="let node;when: hasChild" matTreeNodePadding matTreeNodePaddingIndent="10"
@@ -16,6 +19,9 @@
         {{treeControl.isExpanded(node) ? 'expand_more' : 'chevron_right'}}
       </mat-icon>
     </button>
-    {{node.name}}
+    <div>
+      <button mat-icon-button class="small-icon-button"><mat-icon>code</mat-icon></button>
+      <span>{{node.name}}</span>
+    </div>
   </mat-tree-node>
 </mat-tree>