diff --git a/java/server/src/org/openqa/grid/images/safari_technology_preview.png b/java/server/src/org/openqa/grid/images/safari_technology_preview.png
new file mode 100644
index 0000000000000..4958b23c6f179
Binary files /dev/null and b/java/server/src/org/openqa/grid/images/safari_technology_preview.png differ
diff --git a/java/server/src/org/openqa/grid/web/servlet/console/MiniCapability.java b/java/server/src/org/openqa/grid/web/servlet/console/MiniCapability.java
index b15831fc715b8..84f4560cbafe2 100644
--- a/java/server/src/org/openqa/grid/web/servlet/console/MiniCapability.java
+++ b/java/server/src/org/openqa/grid/web/servlet/console/MiniCapability.java
@@ -17,6 +17,8 @@
 
 package org.openqa.grid.web.servlet.console;
 
+import com.google.common.base.Strings;
+
 import org.openqa.grid.internal.TestSlot;
 import org.openqa.selenium.remote.BrowserType;
 import org.openqa.selenium.remote.DesiredCapabilities;
@@ -69,7 +71,7 @@ private String getConsoleIconPath(DesiredCapabilities cap) {
 
   private String consoleIconName(DesiredCapabilities cap) {
     String browserString = cap.getBrowserName();
-    if (browserString == null || "".equals(browserString)) {
+    if (Strings.isNullOrEmpty(browserString)) {
       return "missingBrowserName";
     }
 
@@ -92,8 +94,12 @@ private String consoleIconName(DesiredCapabilities cap) {
         ret = BrowserType.FIREFOX;
       }
 
-    } else if (browserString.startsWith("*safari")) {
-      ret = BrowserType.SAFARI;
+    } else if (browserString.toLowerCase().contains("safari")) {
+      if (browserString.toLowerCase().contains("technology")) {
+        ret = "safari_technology_preview";
+      } else {
+        ret = BrowserType.SAFARI;
+      }
     } else if (browserString.startsWith("*googlechrome")) {
       ret = BrowserType.CHROME;
     } else if (browserString.startsWith("opera")) {