diff --git a/res/vector-icons/manifest.json b/res/vector-icons/manifest.json
index 2a34a2d2c2..feab1753cb 100644
--- a/res/vector-icons/manifest.json
+++ b/res/vector-icons/manifest.json
@@ -2,37 +2,37 @@
 	"name": "Riot",
 	"icons": [
 		{
-			"src": "\/icons\/android-chrome-36x36.png",
+			"src": "android-chrome-36x36.png",
 			"sizes": "36x36",
 			"type": "image\/png",
 			"density": "0.75"
 		},
 		{
-			"src": "\/icons\/android-chrome-48x48.png",
+			"src": "android-chrome-48x48.png",
 			"sizes": "48x48",
 			"type": "image\/png",
 			"density": "1.0"
 		},
 		{
-			"src": "\/icons\/android-chrome-72x72.png",
+			"src": "android-chrome-72x72.png",
 			"sizes": "72x72",
 			"type": "image\/png",
 			"density": "1.5"
 		},
 		{
-			"src": "\/icons\/android-chrome-96x96.png",
+			"src": "android-chrome-96x96.png",
 			"sizes": "96x96",
 			"type": "image\/png",
 			"density": "2.0"
 		},
 		{
-			"src": "\/icons\/android-chrome-144x144.png",
+			"src": "android-chrome-144x144.png",
 			"sizes": "144x144",
 			"type": "image\/png",
 			"density": "3.0"
 		},
 		{
-			"src": "\/icons\/android-chrome-192x192.png",
+			"src": "android-chrome-192x192.png",
 			"sizes": "192x192",
 			"type": "image\/png",
 			"density": "4.0"
diff --git a/test/app-tests/joining.js b/test/app-tests/joining.js
index 442b67c2db..30ef70db90 100644
--- a/test/app-tests/joining.js
+++ b/test/app-tests/joining.js
@@ -95,7 +95,10 @@ describe('joining a room', function () {
             });
 
             var roomView;
-            httpBackend.flush().then(() => {
+            // wait for /sync to happen
+            return q.delay(1).then(() => {
+                return httpBackend.flush();
+            }).then(() => {
                 var roomDir = ReactTestUtils.findRenderedComponentWithType(
                     matrixChat, RoomDirectory);