diff --git a/ControlRoom/Simulator UI/ControlScreens/AppView/AppView.swift b/ControlRoom/Simulator UI/ControlScreens/AppView/AppView.swift
index 8011e99..58cbf46 100644
--- a/ControlRoom/Simulator UI/ControlScreens/AppView/AppView.swift	
+++ b/ControlRoom/Simulator UI/ControlScreens/AppView/AppView.swift	
@@ -143,7 +143,7 @@ struct AppView: View {
             .padding()
         }
         .tabItem {
-            Text("App")
+            Label("App", systemImage: "plus.app")
         }
         .alert(isPresented: $shouldShowUninstallConfirmationAlert) {
             Alert(title: Text("Are you sure you want to permanently delete \(selectedApplication.displayName)"),
diff --git a/ControlRoom/Simulator UI/ControlScreens/ColorsView.swift b/ControlRoom/Simulator UI/ControlScreens/ColorsView.swift
index 1f04a88..5f88a65 100644
--- a/ControlRoom/Simulator UI/ControlScreens/ColorsView.swift	
+++ b/ControlRoom/Simulator UI/ControlScreens/ColorsView.swift	
@@ -134,7 +134,7 @@ struct ColorsView: View {
         }
         .padding()
         .tabItem {
-            Text("Colors")
+            Label("Colors", systemImage: "paintpalette")
         }
     }
 
diff --git a/ControlRoom/Simulator UI/ControlScreens/LocationVIew/LocationView.swift b/ControlRoom/Simulator UI/ControlScreens/LocationVIew/LocationView.swift
index 9dd4c33..d83dcde 100644
--- a/ControlRoom/Simulator UI/ControlScreens/LocationVIew/LocationView.swift	
+++ b/ControlRoom/Simulator UI/ControlScreens/LocationVIew/LocationView.swift	
@@ -158,7 +158,7 @@ struct LocationView: View {
             }
         }
         .tabItem {
-            Text("Location")
+            Label("Location", systemImage: "location.fill")
         }
         .padding()
         .onReceive(jitterTimer) { _ in
diff --git a/ControlRoom/Simulator UI/ControlScreens/OverridesView.swift b/ControlRoom/Simulator UI/ControlScreens/OverridesView.swift
index 9f74805..5132a2e 100644
--- a/ControlRoom/Simulator UI/ControlScreens/OverridesView.swift	
+++ b/ControlRoom/Simulator UI/ControlScreens/OverridesView.swift	
@@ -112,7 +112,7 @@ struct OverridesView: View {
             .padding()
         }
         .tabItem {
-            Text("Overrides")
+            Label("Overrides", systemImage: "switch.2")
         }
     }
 
diff --git a/ControlRoom/Simulator UI/ControlScreens/SnapshotsView.swift b/ControlRoom/Simulator UI/ControlScreens/SnapshotsView.swift
index e16f743..4d7a789 100644
--- a/ControlRoom/Simulator UI/ControlScreens/SnapshotsView.swift	
+++ b/ControlRoom/Simulator UI/ControlScreens/SnapshotsView.swift	
@@ -83,7 +83,7 @@ struct SnapshotsView: View {
 			}
 		}
         .tabItem {
-            Text("Snapshots")
+            Label("Snapshots", systemImage: "camera")
         }
         .sheet(item: $snapshotAction) { action in
             switch action {
diff --git a/ControlRoom/Simulator UI/ControlScreens/StatusBarView.swift b/ControlRoom/Simulator UI/ControlScreens/StatusBarView.swift
index 29ece9e..f59c426 100644
--- a/ControlRoom/Simulator UI/ControlScreens/StatusBarView.swift	
+++ b/ControlRoom/Simulator UI/ControlScreens/StatusBarView.swift	
@@ -131,7 +131,7 @@ struct StatusBarView: View {
             .padding()
         }
         .tabItem {
-            Text("Status Bar")
+            Label("Status Bar", systemImage: "bolt.badge.clock")
         }
     }
 
diff --git a/ControlRoom/Simulator UI/ControlScreens/SystemView/SystemView.swift b/ControlRoom/Simulator UI/ControlScreens/SystemView/SystemView.swift
index aba31ef..4d06b4e 100644
--- a/ControlRoom/Simulator UI/ControlScreens/SystemView/SystemView.swift	
+++ b/ControlRoom/Simulator UI/ControlScreens/SystemView/SystemView.swift	
@@ -139,7 +139,7 @@ struct SystemView: View {
             .padding()
         }
         .tabItem {
-            Text("System")
+            Label("System", systemImage: "gear")
         }
         .onAppear {
             isLoggingEnabled = UserDefaults.standard.bool(forKey: "\(simulator.udid).logging")
diff --git a/ControlRoom/Simulator UI/ControlView.swift b/ControlRoom/Simulator UI/ControlView.swift
index d6b049e..9d6bf94 100644
--- a/ControlRoom/Simulator UI/ControlView.swift	
+++ b/ControlRoom/Simulator UI/ControlView.swift	
@@ -101,5 +101,6 @@ struct ControlView_Previews: PreviewProvider {
                     simulator: .example,
                     applications: [])
             .environmentObject(Preferences())
+            .environmentObject(DeepLinksController())
     }
 }