From 04bd98b15ffd9a7f73966bd543a5896179eafffc Mon Sep 17 00:00:00 2001
From: howard-stearns <howard.stearns@gmail.com>
Date: Thu, 4 Aug 2016 12:33:50 -0700
Subject: [PATCH] new assets. remove margins between buttons (letting the
 graphics do the work)

---
 interface/resources/images/address-bar.svg   | 12 ++--
 interface/resources/images/backward.svg      | 26 ++++----
 interface/resources/images/forward.svg       | 26 ++++----
 interface/resources/images/home.svg          | 62 +++++++++++---------
 interface/resources/images/places.svg        | 36 ++++++------
 interface/resources/images/snap-feed.svg     | 48 +++++++--------
 interface/resources/qml/AddressBarDialog.qml |  9 ++-
 7 files changed, 111 insertions(+), 108 deletions(-)

diff --git a/interface/resources/images/address-bar.svg b/interface/resources/images/address-bar.svg
index 76ad7c0547..a8cb158492 100644
--- a/interface/resources/images/address-bar.svg
+++ b/interface/resources/images/address-bar.svg
@@ -9,10 +9,10 @@
 	.st1{fill:#E6E7E8;}
 	.st2{fill:#FFFFFF;}
 </style>
-<path class="st0" d="M1429.02,164.97H11.08c-6.04,0-10.98-4.94-10.98-10.98V51.71c0-6.04,4.94-10.98,10.98-10.98h1417.94
-	c6.04,0,10.98,4.94,10.98,10.98v102.29C1440,160.03,1435.06,164.97,1429.02,164.97z"/>
-<path class="st1" d="M1429.02,159.22H11.08c-6.04,0-10.98-4.94-10.98-10.98V45.96c0-6.04,4.94-10.98,10.98-10.98h1417.94
-	c6.04,0,10.98,4.94,10.98,10.98v102.29C1440,154.28,1435.06,159.22,1429.02,159.22z"/>
-<path class="st2" d="M1052.22,159.22H388.1c-4.15,0-7.54-3.39-7.54-7.54V42.52c0-4.15,3.39-7.54,7.54-7.54h664.12
-	c4.15,0,7.54,3.39,7.54,7.54v109.16C1059.75,155.83,1056.36,159.22,1052.22,159.22z"/>
+<path class="st0" d="M1428.61,172H11.46c-6.27,0-11.39-5.13-11.39-11.39V49.58c0-6.27,5.13-11.39,11.39-11.39h1417.15
+	c6.27,0,11.39,5.13,11.39,11.39v111.03C1440,166.87,1434.87,172,1428.61,172z"/>
+<path class="st1" d="M1428.61,165.81H11.46c-6.27,0-11.39-5.13-11.39-11.39V43.39c0-6.27,5.13-11.39,11.39-11.39h1417.15
+	c6.27,0,11.39,5.13,11.39,11.39v111.03C1440,160.68,1434.87,165.81,1428.61,165.81z"/>
+<path class="st2" d="M1133.24,165.81H417.95c-4.47,0-8.12-3.65-8.12-8.12V40.11c0-4.47,3.65-8.12,8.12-8.12h715.28
+	c4.47,0,8.12,3.65,8.12,8.12v117.57C1141.36,162.15,1137.7,165.81,1133.24,165.81z"/>
 </svg>
diff --git a/interface/resources/images/backward.svg b/interface/resources/images/backward.svg
index 9d36778aa3..e4502fa80e 100644
--- a/interface/resources/images/backward.svg
+++ b/interface/resources/images/backward.svg
@@ -9,19 +9,19 @@
 	.st3{fill:#31D8FF;}
 </style>
 <g id="Layer_1">
-	<path class="st0" d="M33.44,87.42l-11.3-11.3l-0.91-0.91l0.91-0.91l11.54-11.54c0.73-0.73,0.73-1.93,0-2.66
-		c-0.35-0.35-0.83-0.55-1.33-0.55c-0.5,0-0.97,0.2-1.33,0.55L15.92,75.21l14.87,14.87c0.36,0.36,0.83,0.55,1.33,0.55
-		c0.5,0,0.97-0.2,1.33-0.55C34.18,89.35,34.18,88.15,33.44,87.42z"/>
-	<path class="st1" d="M33.44,35.79l-11.3-11.3l-0.91-0.91l0.91-0.91l11.54-11.54c0.73-0.73,0.73-1.93,0-2.66
-		c-0.35-0.35-0.83-0.55-1.33-0.55c-0.5,0-0.97,0.2-1.33,0.55L15.92,23.58l14.87,14.87c0.36,0.36,0.83,0.55,1.33,0.55
-		c0.5,0,0.97-0.2,1.33-0.55C34.18,37.72,34.18,36.53,33.44,35.79z"/>
-	<path class="st2" d="M14.09,124.84l15.78,15.78c1.24,1.24,3.25,1.24,4.48,0c1.24-1.24,1.24-3.25,0-4.48l-11.3-11.3L34.6,113.3
-		c1.24-1.24,1.24-3.25,0-4.48c-1.24-1.24-3.25-1.24-4.48,0L14.09,124.84z"/>
-	<path class="st3" d="M32.36,109.18c0.5,0,0.97,0.2,1.33,0.55c0.73,0.73,0.73,1.93,0,2.66l-11.54,11.54l-0.91,0.91l0.91,0.91
-		l11.3,11.3c0.73,0.73,0.73,1.93,0,2.66c-0.36,0.36-0.83,0.55-1.33,0.55c-0.5,0-0.97-0.2-1.33-0.55l-14.87-14.87l15.11-15.11
-		C31.38,109.37,31.86,109.18,32.36,109.18 M32.36,107.89c-0.81,0-1.62,0.31-2.24,0.93l-16.02,16.03l15.78,15.78
-		c0.62,0.62,1.43,0.93,2.24,0.93c0.81,0,1.62-0.31,2.24-0.93c1.24-1.24,1.24-3.25,0-4.48l-11.3-11.3L34.6,113.3
-		c1.24-1.24,1.24-3.25,0-4.48C33.98,108.2,33.17,107.89,32.36,107.89L32.36,107.89z"/>
+	<path class="st0" d="M33.72,85.08l-9.15-9.15l-0.74-0.74l0.74-0.74l9.35-9.35c0.59-0.59,0.59-1.56,0-2.15
+		c-0.29-0.29-0.67-0.45-1.08-0.45c-0.41,0-0.79,0.16-1.08,0.45L19.52,75.19l12.04,12.04c0.29,0.29,0.67,0.45,1.08,0.45
+		c0.41,0,0.79-0.16,1.08-0.45C34.31,86.64,34.31,85.67,33.72,85.08z"/>
+	<path class="st1" d="M33.72,33.45l-9.15-9.15l-0.74-0.74l0.74-0.74l9.35-9.35c0.59-0.59,0.59-1.56,0-2.15
+		c-0.29-0.29-0.67-0.45-1.08-0.45c-0.41,0-0.79,0.16-1.08,0.45L19.52,23.56L31.56,35.6c0.29,0.29,0.67,0.45,1.08,0.45
+		c0.41,0,0.79-0.16,1.08-0.45C34.31,35.01,34.31,34.04,33.72,33.45z"/>
+	<path class="st2" d="M17.99,124.82l12.78,12.78c1,1,2.63,1,3.63,0c1-1,1-2.63,0-3.63l-9.15-9.15l9.35-9.35c1-1,1-2.63,0-3.63
+		c-1-1-2.63-1-3.63,0L17.99,124.82z"/>
+	<path class="st3" d="M32.79,112.13c0.41,0,0.79,0.16,1.08,0.45c0.59,0.59,0.59,1.56,0,2.15l-9.35,9.35l-0.74,0.74l0.74,0.74
+		l9.15,9.15c0.59,0.59,0.59,1.56,0,2.15c-0.29,0.29-0.67,0.45-1.08,0.45c-0.41,0-0.79-0.16-1.08-0.45l-12.04-12.04l12.24-12.24
+		C32,112.29,32.38,112.13,32.79,112.13 M32.79,111.08c-0.66,0-1.31,0.25-1.82,0.75l-12.98,12.98l12.78,12.78
+		c0.5,0.5,1.16,0.75,1.82,0.75c0.66,0,1.31-0.25,1.82-0.75c1-1,1-2.63,0-3.63l-9.15-9.15l9.35-9.35c1-1,1-2.63,0-3.63
+		C34.1,111.34,33.44,111.08,32.79,111.08L32.79,111.08z"/>
 </g>
 <g id="Layer_2">
 </g>
diff --git a/interface/resources/images/forward.svg b/interface/resources/images/forward.svg
index 65ec62f947..0c5cbe3d0c 100644
--- a/interface/resources/images/forward.svg
+++ b/interface/resources/images/forward.svg
@@ -9,19 +9,19 @@
 	.st3{fill:#31D8FF;}
 </style>
 <g id="Layer_1">
-	<path class="st0" d="M21.06,60.1c-0.36-0.36-0.83-0.55-1.33-0.55c-0.5,0-0.97,0.2-1.33,0.55c-0.73,0.73-0.73,1.93,0,2.66
-		L29.94,74.3l0.91,0.91l-0.91,0.91l-11.3,11.3c-0.73,0.73-0.73,1.93,0,2.66c0.35,0.35,0.83,0.55,1.33,0.55c0.5,0,0.97-0.2,1.33-0.55
-		l14.87-14.87L21.06,60.1z"/>
-	<path class="st1" d="M21.06,8.47c-0.36-0.36-0.83-0.55-1.33-0.55c-0.5,0-0.97,0.2-1.33,0.55c-0.73,0.73-0.73,1.93,0,2.66
-		l11.54,11.54l0.91,0.91l-0.91,0.91l-11.3,11.3c-0.73,0.73-0.73,1.93,0,2.66C19,38.81,19.47,39,19.97,39c0.5,0,0.97-0.2,1.33-0.55
-		l14.87-14.87L21.06,8.47z"/>
-	<path class="st2" d="M37.99,124.84l-15.78,15.78c-1.24,1.24-3.25,1.24-4.48,0c-1.24-1.24-1.24-3.25,0-4.48l11.3-11.3L17.49,113.3
-		c-1.24-1.24-1.24-3.25,0-4.48c1.24-1.24,3.25-1.24,4.48,0L37.99,124.84z"/>
-	<path class="st3" d="M19.73,109.18c0.5,0,0.97,0.2,1.33,0.55l15.11,15.11L21.3,139.71c-0.36,0.36-0.83,0.55-1.33,0.55
-		c-0.5,0-0.97-0.2-1.33-0.55c-0.73-0.73-0.73-1.93,0-2.66l11.3-11.3l0.91-0.91l-0.91-0.91L18.4,112.39c-0.73-0.73-0.73-1.93,0-2.66
-		C18.75,109.37,19.22,109.18,19.73,109.18 M19.73,107.89c-0.81,0-1.62,0.31-2.24,0.93c-1.24,1.24-1.24,3.25,0,4.48l11.54,11.54
-		l-11.3,11.3c-1.24,1.24-1.24,3.25,0,4.48c0.62,0.62,1.43,0.93,2.24,0.93c0.81,0,1.62-0.31,2.24-0.93l15.78-15.78l-16.02-16.03
-		C21.35,108.2,20.54,107.89,19.73,107.89L19.73,107.89z"/>
+	<path class="st0" d="M21.12,62.95c-0.29-0.29-0.67-0.45-1.08-0.45c-0.41,0-0.79,0.16-1.08,0.45c-0.59,0.59-0.59,1.56,0,2.15
+		l9.35,9.35l0.74,0.74l-0.74,0.74l-9.15,9.15c-0.59,0.59-0.59,1.56,0,2.15c0.29,0.29,0.67,0.45,1.08,0.45
+		c0.41,0,0.79-0.16,1.08-0.45l12.04-12.04L21.12,62.95z"/>
+	<path class="st1" d="M21.12,11.32c-0.29-0.29-0.67-0.45-1.08-0.45c-0.41,0-0.79,0.16-1.08,0.45c-0.59,0.59-0.59,1.56,0,2.15
+		l9.35,9.35l0.74,0.74l-0.74,0.74l-9.15,9.15c-0.59,0.59-0.59,1.56,0,2.15c0.29,0.29,0.67,0.45,1.08,0.45
+		c0.41,0,0.79-0.16,1.08-0.45l12.04-12.04L21.12,11.32z"/>
+	<path class="st2" d="M34.9,124.82L22.11,137.6c-1,1-2.63,1-3.63,0c-1-1-1-2.63,0-3.63l9.15-9.15l-9.35-9.35c-1-1-1-2.63,0-3.63
+		c1-1,2.63-1,3.63,0L34.9,124.82z"/>
+	<path class="st3" d="M20.1,112.13c0.41,0,0.79,0.16,1.08,0.45l12.24,12.24l-12.04,12.04c-0.29,0.29-0.67,0.45-1.08,0.45
+		c-0.41,0-0.79-0.16-1.08-0.45c-0.59-0.59-0.59-1.56,0-2.15l9.15-9.15l0.74-0.74l-0.74-0.74l-9.35-9.35c-0.59-0.59-0.59-1.56,0-2.15
+		C19.31,112.29,19.69,112.13,20.1,112.13 M20.1,111.08c-0.66,0-1.31,0.25-1.82,0.75c-1,1-1,2.63,0,3.63l9.35,9.35l-9.15,9.15
+		c-1,1-1,2.63,0,3.63c0.5,0.5,1.16,0.75,1.82,0.75s1.31-0.25,1.82-0.75l12.78-12.78l-12.98-12.98
+		C21.41,111.34,20.76,111.08,20.1,111.08L20.1,111.08z"/>
 </g>
 <g id="Layer_2">
 </g>
diff --git a/interface/resources/images/home.svg b/interface/resources/images/home.svg
index 1e201a1a9d..7740dc9568 100644
--- a/interface/resources/images/home.svg
+++ b/interface/resources/images/home.svg
@@ -9,37 +9,41 @@
 	.st3{fill:#31D8FF;}
 </style>
 <g id="Layer_1">
-	<path class="st0" d="M40.57,70.27c-0.07-0.41-0.29-0.77-0.62-1.01l-14.3-10.31l-10.95,7.62l-0.01,0l-0.01,0l-3.98,2.65
-		c-0.34,0.23-0.58,0.58-0.66,0.98c-0.08,0.41,0,0.82,0.23,1.16c0.29,0.43,0.77,0.69,1.29,0.69c0.3,0,0.6-0.09,0.86-0.26l3.99-2.66
-		l8.83-6.14l0.38-0.26l0.37,0.27l12.15,8.76c0.27,0.19,0.58,0.29,0.9,0.29c0.5,0,0.97-0.24,1.26-0.64
-		C40.54,71.09,40.64,70.68,40.57,70.27z"/>
-	<path class="st0" d="M23.02,81.42c0-1.5,1.29-2.71,2.8-2.71c1.5,0,2.8,1.24,2.8,2.74v8.07h10.11V77.57l-4.38-3.22l-8.61-6.24
-		l-9.17,6.19l-4.3,2.8v12.42h10.76V81.42z"/>
-	<path class="st1" d="M40.57,18.64c-0.07-0.41-0.29-0.77-0.62-1.01L25.65,7.33l-10.95,7.62l-0.01,0l-0.01,0l-3.98,2.65
-		c-0.34,0.23-0.58,0.58-0.66,0.98c-0.08,0.41,0,0.82,0.23,1.16c0.29,0.43,0.77,0.69,1.29,0.69c0.3,0,0.6-0.09,0.86-0.26l3.99-2.66
-		l8.83-6.14l0.38-0.26l0.37,0.27l12.15,8.76c0.27,0.19,0.58,0.29,0.9,0.29c0.5,0,0.97-0.24,1.26-0.64
-		C40.54,19.46,40.64,19.05,40.57,18.64z"/>
-	<path class="st1" d="M23.02,29.79c0-1.5,1.29-2.71,2.8-2.71c1.5,0,2.8,1.24,2.8,2.74v8.07h10.11V25.94l-4.38-3.22l-8.61-6.24
-		l-9.17,6.19l-4.3,2.8V37.9h10.76V29.79z"/>
 	<g>
-		<path class="st2" d="M11.56,122.34c-0.71,0-1.41-0.34-1.83-0.98c-0.67-1.01-0.4-2.37,0.61-3.04l3.98-2.65l11.33-7.88l14.67,10.57
-			c0.98,0.71,1.21,2.08,0.5,3.06c-0.71,0.98-2.08,1.21-3.06,0.5l-12.15-8.76l-8.83,6.14l-4,2.66
-			C12.4,122.22,11.98,122.34,11.56,122.34z"/>
-		<path class="st2" d="M39.04,122.45c-0.48,0-0.94-0.15-1.34-0.43l-12.09-8.71l-8.77,6.1l-4,2.66c-0.38,0.25-0.82,0.39-1.27,0.39
-			c-0.77,0-1.49-0.38-1.92-1.03c-0.7-1.06-0.42-2.49,0.64-3.19l3.98-2.65l11.39-7.92l14.73,10.62c0.5,0.36,0.83,0.89,0.93,1.5
-			c0.1,0.61-0.05,1.22-0.4,1.71c-0.36,0.5-0.89,0.83-1.5,0.93C39.29,122.44,39.16,122.45,39.04,122.45z M25.61,113.04l12.21,8.8
-			c0.45,0.33,1,0.46,1.55,0.37c0.55-0.09,1.03-0.39,1.36-0.84c0.33-0.45,0.46-1,0.37-1.55c-0.09-0.55-0.39-1.03-0.84-1.36
-			l-14.61-10.53l-11.27,7.84l-3.98,2.65c-0.96,0.64-1.22,1.93-0.58,2.89c0.39,0.58,1.04,0.93,1.74,0.93c0.41,0,0.81-0.12,1.15-0.35
-			l4-2.66L25.61,113.04z"/>
+		<path class="st0" d="M36.75,71.26c-0.05-0.31-0.22-0.57-0.47-0.76l-10.72-7.73l-8.21,5.71l0,0l0,0l-2.98,1.99
+			c-0.26,0.17-0.43,0.43-0.5,0.74c-0.06,0.3,0,0.61,0.17,0.87c0.22,0.32,0.58,0.52,0.97,0.52c0.23,0,0.45-0.07,0.64-0.19l2.99-1.99
+			l6.62-4.61l0.28-0.2l0.28,0.2l9.11,6.57c0.2,0.14,0.43,0.22,0.68,0.22c0.37,0,0.73-0.18,0.94-0.48
+			C36.73,71.88,36.8,71.57,36.75,71.26z"/>
+		<path class="st0" d="M23.59,79.62c0-1.13,0.97-2.03,2.1-2.03c1.13,0,2.1,0.93,2.1,2.06v6.06h7.58v-8.97l-3.28-2.41l-6.46-4.68
+			l-6.88,4.64l-3.23,2.1v9.32h8.07V79.62z"/>
 	</g>
-	<path class="st3" d="M40.39,118.28l-14.73-10.62l-11.39,7.92l-3.98,2.65c-1.06,0.7-1.34,2.13-0.64,3.19
-		c0.43,0.64,1.14,1.03,1.92,1.03c0.45,0,0.89-0.13,1.27-0.39l4-2.66l8.77-6.1l12.09,8.71c0.39,0.28,0.86,0.43,1.34,0.43
-		c0.74,0,1.44-0.36,1.87-0.96C41.65,120.47,41.42,119.02,40.39,118.28z M14.76,116.29l10.89-7.58l14.24,10.26
-		c0.31,0.23,0.52,0.56,0.58,0.94c0.06,0.38-0.03,0.76-0.25,1.07c-0.27,0.37-0.71,0.6-1.17,0.6c-0.3,0-0.59-0.09-0.84-0.27
-		l-12.58-9.07l-9.26,6.44l-3.99,2.66c-0.24,0.16-0.51,0.24-0.8,0.24c-0.48,0-0.93-0.24-1.2-0.64c-0.21-0.32-0.29-0.7-0.21-1.08
-		c0.08-0.38,0.29-0.7,0.61-0.92L14.76,116.29z"/>
-	<path class="st2" d="M23.02,131.04c0-1.5,1.29-2.71,2.8-2.71c1.5,0,2.8,1.24,2.8,2.74v8.07h10.11v-11.96l-4.38-3.22l-8.61-6.24
-		l-9.17,6.19l-4.3,2.8v12.42h10.76V131.04z"/>
+	<g>
+		<path class="st1" d="M36.75,19.64c-0.05-0.31-0.22-0.57-0.47-0.76l-10.72-7.73l-8.21,5.71l0,0l0,0l-2.98,1.99
+			c-0.26,0.17-0.43,0.43-0.5,0.74c-0.06,0.3,0,0.61,0.17,0.87c0.22,0.32,0.58,0.52,0.97,0.52c0.23,0,0.45-0.07,0.64-0.19l2.99-1.99
+			l6.62-4.61l0.28-0.2l0.28,0.2l9.11,6.57c0.2,0.14,0.43,0.22,0.68,0.22c0.37,0,0.73-0.18,0.94-0.48
+			C36.73,20.25,36.8,19.94,36.75,19.64z"/>
+		<path class="st1" d="M23.59,27.99c0-1.13,0.97-2.03,2.1-2.03c1.13,0,2.1,0.93,2.1,2.06v6.06h7.58v-8.97l-3.28-2.41l-6.46-4.68
+			l-6.88,4.64l-3.23,2.1v9.32h8.07V27.99z"/>
+	</g>
+	<g>
+		<path class="st2" d="M15,122.61c-0.53,0-1.05-0.26-1.37-0.73c-0.5-0.76-0.3-1.78,0.46-2.28l2.98-1.99l8.5-5.91l11,7.93
+			c0.74,0.53,0.9,1.56,0.37,2.3c-0.53,0.74-1.56,0.9-2.3,0.37l-9.11-6.57l-6.63,4.61l-3,1.99C15.63,122.52,15.31,122.61,15,122.61z"
+			/>
+		<path class="st2" d="M35.6,122.69c-0.36,0-0.71-0.11-1.01-0.33l-9.07-6.53l-6.58,4.58l-3,2c-0.28,0.19-0.61,0.29-0.95,0.29
+			c-0.58,0-1.12-0.29-1.44-0.77c-0.53-0.79-0.31-1.87,0.48-2.39l2.98-1.99l8.54-5.94l11.05,7.96c0.37,0.27,0.62,0.67,0.69,1.12
+			c0.07,0.46-0.03,0.91-0.3,1.29c-0.27,0.37-0.67,0.62-1.12,0.69C35.79,122.68,35.7,122.69,35.6,122.69z M25.53,115.63l9.16,6.6
+			c0.34,0.24,0.75,0.34,1.17,0.28s0.77-0.29,1.02-0.63c0.24-0.34,0.34-0.75,0.28-1.17c-0.07-0.41-0.29-0.77-0.63-1.02l-10.96-7.9
+			l-8.45,5.88l-2.98,1.99c-0.72,0.48-0.91,1.45-0.44,2.17c0.29,0.44,0.78,0.7,1.3,0.7c0.31,0,0.61-0.09,0.87-0.26l3-1.99
+			L25.53,115.63z"/>
+	</g>
+	<path class="st3" d="M36.62,119.56l-11.05-7.96l-8.54,5.94l-2.98,1.99c-0.79,0.53-1.01,1.6-0.48,2.39
+		c0.32,0.48,0.86,0.77,1.44,0.77c0.34,0,0.67-0.1,0.95-0.29l3-2l6.58-4.58l9.07,6.53c0.3,0.21,0.64,0.33,1.01,0.33
+		c0.55,0,1.08-0.27,1.4-0.72C37.56,121.2,37.39,120.12,36.62,119.56z M17.39,118.07l8.17-5.68l10.68,7.7
+		c0.23,0.17,0.39,0.42,0.43,0.7c0.05,0.28-0.02,0.57-0.19,0.8c-0.2,0.28-0.53,0.45-0.88,0.45c-0.23,0-0.45-0.07-0.63-0.2l-9.44-6.8
+		l-6.95,4.83l-2.99,1.99c-0.18,0.12-0.38,0.18-0.6,0.18c-0.36,0-0.7-0.18-0.9-0.48c-0.16-0.24-0.22-0.53-0.16-0.81
+		c0.06-0.28,0.22-0.53,0.46-0.69L17.39,118.07z"/>
+	<path class="st2" d="M23.59,129.14c0-1.13,0.97-2.03,2.1-2.03c1.13,0,2.1,0.93,2.1,2.06v6.06h7.58v-8.97l-3.28-2.41l-6.46-4.68
+		l-6.88,4.64l-3.23,2.1v9.32h8.07V129.14z"/>
 </g>
 <g id="Layer_2">
 </g>
diff --git a/interface/resources/images/places.svg b/interface/resources/images/places.svg
index 6336ab111f..f70695d606 100644
--- a/interface/resources/images/places.svg
+++ b/interface/resources/images/places.svg
@@ -9,24 +9,24 @@
 	.st3{fill:#31D8FF;}
 </style>
 <g id="Layer_1">
-	<path class="st0" d="M25.87,55.25c-6.44,0-11.67,5.22-11.67,11.67c0,6.44,11.67,22,11.67,22s11.67-15.55,11.67-22
-		C37.54,60.47,32.32,55.25,25.87,55.25z M25.87,72.08c-3.31,0-6-2.68-6-6c0-3.31,2.68-6,6-6s6,2.68,6,6
-		C31.87,69.4,29.18,72.08,25.87,72.08z"/>
-	<path class="st0" d="M40.17,90.17H10.64c-0.66,0-1.19,0.52-1.19,1.18s0.54,1.18,1.19,1.18h29.53c0.66,0,1.19-0.52,1.19-1.18
-		S40.83,90.17,40.17,90.17z"/>
-	<path class="st1" d="M25.87,3.62c-6.44,0-11.67,5.22-11.67,11.67c0,6.44,11.67,22,11.67,22s11.67-15.55,11.67-22
-		C37.54,8.84,32.32,3.62,25.87,3.62z M25.87,20.45c-3.31,0-6-2.68-6-6c0-3.31,2.68-6,6-6s6,2.68,6,6
-		C31.87,17.77,29.18,20.45,25.87,20.45z"/>
-	<path class="st1" d="M40.17,38.54H10.64c-0.66,0-1.19,0.52-1.19,1.18s0.54,1.18,1.19,1.18h29.53c0.66,0,1.19-0.52,1.19-1.18
-		S40.83,38.54,40.17,38.54z"/>
-	<path class="st2" d="M25.87,104.88c-6.44,0-11.67,5.22-11.67,11.67c0,6.44,11.67,22,11.67,22s11.67-15.55,11.67-22
-		C37.54,110.1,32.32,104.88,25.87,104.88z M25.87,121.71c-3.31,0-6-2.68-6-6c0-3.31,2.68-6,6-6s6,2.68,6,6
-		C31.87,119.03,29.18,121.71,25.87,121.71z"/>
-	<path class="st2" d="M40.17,143.11H10.64c-1.13,0-2.05-0.92-2.05-2.05S9.5,139,10.64,139h29.53c1.13,0,2.05,0.92,2.05,2.05
-		S41.3,143.11,40.17,143.11z"/>
-	<path class="st3" d="M40.17,139.86c0.66,0,1.19,0.54,1.19,1.19c0,0.66-0.54,1.19-1.19,1.19H10.64c-0.66,0-1.19-0.54-1.19-1.19
-		c0-0.66,0.54-1.19,1.19-1.19H40.17 M40.17,139H10.64c-1.13,0-2.05,0.92-2.05,2.05s0.92,2.05,2.05,2.05h29.53
-		c1.13,0,2.05-0.92,2.05-2.05S41.3,139,40.17,139L40.17,139z"/>
+	<path class="st0" d="M25.71,59.91c-4.83,0-8.75,3.92-8.75,8.75c0,4.83,8.75,16.5,8.75,16.5s8.75-11.67,8.75-16.5
+		C34.46,63.83,30.54,59.91,25.71,59.91z M25.71,72.53c-2.48,0-4.5-2.01-4.5-4.5c0-2.48,2.01-4.5,4.5-4.5s4.5,2.01,4.5,4.5
+		C30.2,70.52,28.19,72.53,25.71,72.53z"/>
+	<path class="st0" d="M36.43,86.1H14.28c-0.49,0-0.9,0.39-0.9,0.89c0,0.49,0.4,0.89,0.9,0.89h22.15c0.49,0,0.9-0.39,0.9-0.89
+		C37.32,86.49,36.92,86.1,36.43,86.1z"/>
+	<path class="st1" d="M25.71,8.28c-4.83,0-8.75,3.92-8.75,8.75c0,4.83,8.75,16.5,8.75,16.5s8.75-11.67,8.75-16.5
+		C34.46,12.2,30.54,8.28,25.71,8.28z M25.71,20.91c-2.48,0-4.5-2.01-4.5-4.5c0-2.48,2.01-4.5,4.5-4.5s4.5,2.01,4.5,4.5
+		C30.2,18.89,28.19,20.91,25.71,20.91z"/>
+	<path class="st1" d="M36.43,34.47H14.28c-0.49,0-0.9,0.39-0.9,0.89s0.4,0.89,0.9,0.89h22.15c0.49,0,0.9-0.39,0.9-0.89
+		S36.92,34.47,36.43,34.47z"/>
+	<path class="st2" d="M25.71,109.66c-4.83,0-8.75,3.92-8.75,8.75c0,4.83,8.75,16.5,8.75,16.5s8.75-11.67,8.75-16.5
+		C34.46,113.57,30.54,109.66,25.71,109.66z M25.71,122.28c-2.48,0-4.5-2.01-4.5-4.5c0-2.48,2.01-4.5,4.5-4.5s4.5,2.01,4.5,4.5
+		C30.2,120.27,28.19,122.28,25.71,122.28z"/>
+	<path class="st2" d="M36.43,138.33H14.28c-0.85,0-1.54-0.69-1.54-1.54s0.69-1.54,1.54-1.54h22.15c0.85,0,1.54,0.69,1.54,1.54
+		S37.28,138.33,36.43,138.33z"/>
+	<path class="st3" d="M36.43,135.89c0.49,0,0.9,0.4,0.9,0.9c0,0.49-0.4,0.9-0.9,0.9H14.28c-0.49,0-0.9-0.4-0.9-0.9
+		c0-0.49,0.4-0.9,0.9-0.9H36.43 M36.43,135.25H14.28c-0.85,0-1.54,0.69-1.54,1.54c0,0.85,0.69,1.54,1.54,1.54h22.15
+		c0.85,0,1.54-0.69,1.54-1.54C37.97,135.94,37.28,135.25,36.43,135.25L36.43,135.25z"/>
 </g>
 <g id="Layer_2">
 </g>
diff --git a/interface/resources/images/snap-feed.svg b/interface/resources/images/snap-feed.svg
index 3eae156cd6..c2dede6e0f 100644
--- a/interface/resources/images/snap-feed.svg
+++ b/interface/resources/images/snap-feed.svg
@@ -9,31 +9,31 @@
 	.st3{fill:#31D8FF;}
 </style>
 <g id="Layer_1">
-	<circle class="st0" cx="25.17" cy="68.35" r="5.92"/>
-	<path class="st0" d="M36.27,85.81c0.02-0.01,0.03-0.03,0.05-0.04v-2.47c0-3.57-3.1-6.36-6.67-6.36h-8.56
-		c-3.57,0-6.46,2.79-6.46,6.36v2.51H36.27z"/>
-	<path class="st0" d="M48.67,64.69c0-5.29-4.29-9.58-9.58-9.58H12.01c-5.29,0-9.58,4.29-9.58,9.58V83.6c0,5.29,4.29,9.58,9.58,9.58
-		h27.08c5.29,0,9.58-4.29,9.58-9.58V64.69z M46.31,83.72c0,4.04-3.27,7.31-7.31,7.31H11.89c-4.04,0-7.31-3.27-7.31-7.31V64.78
-		c0-4.04,3.27-7.31,7.31-7.31h27.11c4.04,0,7.31,3.27,7.31,7.31V83.72z"/>
-	<circle class="st1" cx="25.17" cy="16.72" r="5.92"/>
-	<path class="st1" d="M36.27,34.18c0.02-0.01,0.03-0.03,0.05-0.04v-2.47c0-3.57-3.1-6.36-6.67-6.36h-8.56
-		c-3.57,0-6.46,2.79-6.46,6.36v2.51H36.27z"/>
-	<path class="st1" d="M48.67,13.06c0-5.29-4.29-9.58-9.58-9.58H12.01c-5.29,0-9.58,4.29-9.58,9.58v18.91c0,5.29,4.29,9.58,9.58,9.58
-		h27.08c5.29,0,9.58-4.29,9.58-9.58V13.06z M46.31,32.09c0,4.04-3.27,7.31-7.31,7.31H11.89c-4.04,0-7.31-3.27-7.31-7.31V13.16
-		c0-4.04,3.27-7.31,7.31-7.31h27.11c4.04,0,7.31,3.27,7.31,7.31V32.09z"/>
-	<circle class="st2" cx="25.17" cy="117.98" r="5.92"/>
-	<path class="st2" d="M36.27,135.44c0.02-0.01,0.03-0.03,0.05-0.04v-2.47c0-3.57-3.1-6.36-6.67-6.36h-8.56
-		c-3.57,0-6.46,2.79-6.46,6.36v2.51H36.27z"/>
+	<circle class="st0" cx="26.54" cy="69.8" r="4.44"/>
+	<path class="st0" d="M34.87,82.89c0.01-0.01,0.02-0.02,0.03-0.03v-1.86c0-2.68-2.33-4.77-5-4.77h-6.42c-2.68,0-4.85,2.09-4.85,4.77
+		v1.88H34.87z"/>
+	<path class="st0" d="M44.17,67.05c0-3.97-3.22-7.19-7.19-7.19H16.67c-3.97,0-7.19,3.22-7.19,7.19v14.18c0,3.97,3.22,7.19,7.19,7.19
+		h20.31c3.97,0,7.19-3.22,7.19-7.19V67.05z M42.39,81.32c0,3.03-2.46,5.49-5.49,5.49H16.58c-3.03,0-5.49-2.46-5.49-5.49v-14.2
+		c0-3.03,2.46-5.49,5.49-5.49h20.33c3.03,0,5.49,2.46,5.49,5.49V81.32z"/>
+	<circle class="st1" cx="26.54" cy="18.17" r="4.44"/>
+	<path class="st1" d="M34.87,31.26c0.01-0.01,0.02-0.02,0.03-0.03v-1.86c0-2.68-2.33-4.77-5-4.77h-6.42c-2.68,0-4.85,2.09-4.85,4.77
+		v1.88H34.87z"/>
+	<path class="st1" d="M44.17,15.42c0-3.97-3.22-7.19-7.19-7.19H16.67c-3.97,0-7.19,3.22-7.19,7.19V29.6c0,3.97,3.22,7.19,7.19,7.19
+		h20.31c3.97,0,7.19-3.22,7.19-7.19V15.42z M42.39,29.69c0,3.03-2.46,5.49-5.49,5.49H16.58c-3.03,0-5.49-2.46-5.49-5.49V15.5
+		c0-3.03,2.46-5.49,5.49-5.49h20.33c3.03,0,5.49,2.46,5.49,5.49V29.69z"/>
+	<circle class="st2" cx="26.52" cy="119.45" r="4.44"/>
+	<path class="st2" d="M34.85,132.54c0.01-0.01,0.02-0.02,0.03-0.03v-1.86c0-2.68-2.33-4.77-5-4.77h-6.42
+		c-2.68,0-4.85,2.09-4.85,4.77v1.88H34.85z"/>
 	<g>
-		<path class="st2" d="M39.01,143.74H11.94c-5.76,0-10.45-4.69-10.45-10.45v-18.88c0-5.76,4.69-10.45,10.45-10.45h27.07
-			c5.76,0,10.45,4.69,10.45,10.45v18.88C49.45,139.05,44.77,143.74,39.01,143.74z M11.94,107.95c-3.56,0-6.45,2.89-6.45,6.45v18.88
-			c0,3.56,2.89,6.45,6.45,6.45h27.07c3.56,0,6.45-2.89,6.45-6.45v-18.88c0-3.56-2.89-6.45-6.45-6.45H11.94z"/>
-		<path class="st3" d="M39.01,104.82c5.29,0,9.58,4.3,9.58,9.58v18.88c0,5.29-4.3,9.58-9.58,9.58H11.94c-5.29,0-9.58-4.3-9.58-9.58
-			v-18.88c0-5.29,4.3-9.58,9.58-9.58H39.01 M11.94,140.6h27.07c4.03,0,7.31-3.28,7.31-7.31v-18.88c0-4.03-3.28-7.31-7.31-7.31H11.94
-			c-4.03,0-7.31,3.28-7.31,7.31v18.88C4.62,137.32,7.9,140.6,11.94,140.6 M39.01,103.96H11.94c-5.76,0-10.45,4.69-10.45,10.45v18.88
-			c0,5.76,4.69,10.45,10.45,10.45h27.07c5.76,0,10.45-4.69,10.45-10.45v-18.88C49.45,108.65,44.77,103.96,39.01,103.96L39.01,103.96
-			z M11.94,139.74c-3.56,0-6.45-2.89-6.45-6.45v-18.88c0-3.56,2.89-6.45,6.45-6.45h27.07c3.56,0,6.45,2.89,6.45,6.45v18.88
-			c0,3.56-2.89,6.45-6.45,6.45H11.94L11.94,139.74z"/>
+		<path class="st2" d="M36.9,138.76H16.6c-4.32,0-7.83-3.51-7.83-7.83v-14.16c0-4.32,3.51-7.83,7.83-7.83h20.3
+			c4.32,0,7.83,3.51,7.83,7.83v14.16C44.73,135.25,41.22,138.76,36.9,138.76z M16.6,111.93c-2.67,0-4.84,2.17-4.84,4.84v14.16
+			c0,2.67,2.17,4.84,4.84,4.84h20.3c2.67,0,4.84-2.17,4.84-4.84v-14.16c0-2.67-2.17-4.84-4.84-4.84H16.6z"/>
+		<path class="st3" d="M36.9,109.58c3.96,0,7.19,3.22,7.19,7.19v14.16c0,3.96-3.22,7.19-7.19,7.19H16.6c-3.96,0-7.19-3.22-7.19-7.19
+			v-14.16c0-3.96,3.22-7.19,7.19-7.19H36.9 M16.6,136.42h20.3c3.02,0,5.49-2.46,5.49-5.49v-14.16c0-3.02-2.46-5.49-5.49-5.49H16.6
+			c-3.02,0-5.49,2.46-5.49,5.49v14.16C11.11,133.95,13.57,136.42,16.6,136.42 M36.9,108.93H16.6c-4.32,0-7.83,3.51-7.83,7.83v14.16
+			c0,4.32,3.51,7.83,7.83,7.83h20.3c4.32,0,7.83-3.51,7.83-7.83v-14.16C44.73,112.45,41.22,108.93,36.9,108.93L36.9,108.93z
+			 M16.6,135.77c-2.67,0-4.84-2.17-4.84-4.84v-14.16c0-2.67,2.17-4.84,4.84-4.84h20.3c2.67,0,4.84,2.17,4.84,4.84v14.16
+			c0,2.67-2.17,4.84-4.84,4.84H16.6L16.6,135.77z"/>
 	</g>
 </g>
 <g id="Layer_2">
diff --git a/interface/resources/qml/AddressBarDialog.qml b/interface/resources/qml/AddressBarDialog.qml
index 3e676b7340..7eb4de6bba 100644
--- a/interface/resources/qml/AddressBarDialog.qml
+++ b/interface/resources/qml/AddressBarDialog.qml
@@ -131,7 +131,7 @@ Window {
                 onClicked: addressBarDialog.loadHome();
                 anchors {
                     left: parent.left
-                    leftMargin: hifi.layout.spacing * 2
+                    leftMargin: homeButton.width / 2
                     verticalCenter: parent.verticalCenter
                 }
             }
@@ -170,8 +170,8 @@ Window {
                     bottom: parent.bottom
                     left: forwardArrow.right
                     right: placesButton.left
-                    leftMargin: hifi.layout.spacing * 4
-                    rightMargin: hifi.layout.spacing
+                    leftMargin: forwardArrow.width
+                    rightMargin: placesButton.width
                     topMargin: parent.inputAreaStep + hifi.layout.spacing
                     bottomMargin: parent.inputAreaStep + hifi.layout.spacing
                 }
@@ -191,7 +191,6 @@ Window {
                 onClicked: useFeed ? toggleFeed() : identity()
                 anchors {
                     right: feedButton.left;
-                    rightMargin: hifi.layout.spacing * 3;
                     bottom: addressLine.bottom;
                 }
             }
@@ -205,7 +204,7 @@ Window {
                 anchors {
                     right: parent.right;
                     bottom: addressLine.bottom;
-                    rightMargin: hifi.layout.spacing * 3;
+                    rightMargin: feedButton.width / 2
                 }
             }
         }