diff --git a/calendar/pom.xml b/calendar/pom.xml
index ba5ec66..720a1ef 100644
--- a/calendar/pom.xml
+++ b/calendar/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-app-samples</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.8.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/database-perf/pom.xml b/database-perf/pom.xml
index bfb9341..1d688b9 100644
--- a/database-perf/pom.xml
+++ b/database-perf/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-app-samples</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.8.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/ecord/carrierethernet/pom.xml b/ecord/carrierethernet/pom.xml
index 6c3240e..88ab496 100644
--- a/ecord/carrierethernet/pom.xml
+++ b/ecord/carrierethernet/pom.xml
@@ -19,7 +19,7 @@
 
     <groupId>org.onosproject</groupId>
     <artifactId>onos-app-carrierethernet</artifactId>
-    <version>1.7.0-SNAPSHOT</version>
+    <version>1.8.0-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
     <description>Application for installing MEF services in ONOS</description>
@@ -27,7 +27,7 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <onos.version>1.7.0-SNAPSHOT</onos.version>
+        <onos.version>1.8.0-SNAPSHOT</onos.version>
         <onos.app.name>org.onosproject.ecord.carrierethernet</onos.app.name>
         <onos.app.origin>ON.Lab</onos.app.origin>
     </properties>
diff --git a/ecord/co/pom.xml b/ecord/co/pom.xml
index 73ddf8d..52bc7da 100644
--- a/ecord/co/pom.xml
+++ b/ecord/co/pom.xml
@@ -19,13 +19,13 @@
     <parent>
         <artifactId>onos-app-samples</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.8.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <groupId>org.onosproject</groupId>
     <artifactId>onos-app-ecord-co</artifactId>
-    <version>1.7.0-SNAPSHOT</version>
+    <version>1.8.0-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
     <description>Enterprise CORD for Central Office</description>
diff --git a/flowtest/pom.xml b/flowtest/pom.xml
index ec41879..a864d29 100644
--- a/flowtest/pom.xml
+++ b/flowtest/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-app-samples</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.8.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/icona/app/pom.xml b/icona/app/pom.xml
index 63611ed..5d46658 100644
--- a/icona/app/pom.xml
+++ b/icona/app/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-icona</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.8.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/icona/domainmgr/pom.xml b/icona/domainmgr/pom.xml
index 29e3f3c..0a56c8d 100644
--- a/icona/domainmgr/pom.xml
+++ b/icona/domainmgr/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-icona</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.8.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/icona/domainprovider/pom.xml b/icona/domainprovider/pom.xml
index 2c25234..821010a 100644
--- a/icona/domainprovider/pom.xml
+++ b/icona/domainprovider/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-icona</artifactId>
-         <version>1.7.0-SNAPSHOT</version>
+         <version>1.8.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
   </parent>
 
diff --git a/icona/pom.xml b/icona/pom.xml
index f309754..8ba91cf 100644
--- a/icona/pom.xml
+++ b/icona/pom.xml
@@ -22,12 +22,12 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-app-samples</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.8.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>onos-icona</artifactId>
-    <version>1.7.0-SNAPSHOT</version>
+    <version>1.8.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <modules>
diff --git a/ifwd/pom.xml b/ifwd/pom.xml
index af90211..c0bac1b 100644
--- a/ifwd/pom.xml
+++ b/ifwd/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-app-samples</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.8.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/ipfix/pom.xml b/ipfix/pom.xml
index 14f5680..ab5e3be 100644
--- a/ipfix/pom.xml
+++ b/ipfix/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-app-samples</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.8.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/oneping/pom.xml b/oneping/pom.xml
index 0819658..7c4bae8 100644
--- a/oneping/pom.xml
+++ b/oneping/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-app-samples</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.8.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/pom.xml b/pom.xml
index fdda7db..58dbdf8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,11 +20,11 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.8.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-app-samples</artifactId>
-    <version>1.7.0-SNAPSHOT</version>
+    <version>1.8.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <description>ONOS sample applications</description>
@@ -46,7 +46,7 @@
     </modules>
 
     <properties>
-        <onos.version>1.7.0-SNAPSHOT</onos.version>
+        <onos.version>1.8.0-SNAPSHOT</onos.version>
     </properties>
 
     <!-- FIXME remove before release;
diff --git a/sdx-l2/pom.xml b/sdx-l2/pom.xml
index 42ef399..27b1efc 100644
--- a/sdx-l2/pom.xml
+++ b/sdx-l2/pom.xml
@@ -20,19 +20,19 @@
 <parent>
     <artifactId>onos-app-samples</artifactId>
     <groupId>org.onosproject</groupId>
-    <version>1.7.0-SNAPSHOT</version>
+    <version>1.8.0-SNAPSHOT</version>
 </parent>
 
 <groupId>org.onosproject</groupId>
 <artifactId>onos-app-sdx-l2</artifactId>
-<version>1.7.0-SNAPSHOT</version>
+<version>1.8.0-SNAPSHOT</version>
 <packaging>bundle</packaging>
 
 <description>SDX-L2 application to create and manage Ethernet circuits</description>
 <url>http://www.geant.org</url>
 
 <properties>
-    <onos.version>1.7.0-SNAPSHOT</onos.version>
+    <onos.version>1.8.0-SNAPSHOT</onos.version>
     <onos.app.name>org.onosproject.sdx-l2</onos.app.name>
     <onos.app.title>SDX-L2 App</onos.app.title>
     <onos.app.category>Utility</onos.app.category>
diff --git a/sdx-l3/pom.xml b/sdx-l3/pom.xml
index 97f7f52..081b13f 100644
--- a/sdx-l3/pom.xml
+++ b/sdx-l3/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-app-samples</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.8.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/tvue/pom.xml b/tvue/pom.xml
index 4535b02..5a53ae2 100644
--- a/tvue/pom.xml
+++ b/tvue/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-app-samples</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.8.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/uiref/pom.xml b/uiref/pom.xml
index b2569f7..8351e5c 100644
--- a/uiref/pom.xml
+++ b/uiref/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-app-samples</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.8.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/uiref/src/main/java/org/onosproject/uiref/UiRefTopoOverlay.java b/uiref/src/main/java/org/onosproject/uiref/UiRefTopoOverlay.java
index 3553824..a2246b9 100644
--- a/uiref/src/main/java/org/onosproject/uiref/UiRefTopoOverlay.java
+++ b/uiref/src/main/java/org/onosproject/uiref/UiRefTopoOverlay.java
@@ -17,6 +17,7 @@
 package org.onosproject.uiref;
 
 import org.onosproject.net.DeviceId;
+import org.onosproject.ui.GlyphConstants;
 import org.onosproject.ui.UiTopoOverlay;
 import org.onosproject.ui.topo.ButtonId;
 import org.onosproject.ui.topo.PropertyPanel;
@@ -57,7 +58,7 @@
 //        pp.removeAllProps();
 
         pp.title(MY_TITLE)
-                .typeId(TopoConstants.Glyphs.CROWN)
+                .typeId(GlyphConstants.CROWN)
                 .removeProps(
                         TOPOLOGY_SSCS,
                         INTENTS,