diff --git a/angular.json b/angular.json
index dd91961..472caa6 100644
--- a/angular.json
+++ b/angular.json
@@ -24,7 +24,6 @@
             "tsConfig": "tsconfig.app.json",
             "aot": false,
             "assets": [
-              "src/favicon.ico",
               "src/assets",
               "src/manifest.webmanifest"
             ],
@@ -84,4 +83,4 @@
     }
   },
   "defaultProject": "MapAlliance"
-}
\ No newline at end of file
+}
diff --git a/src/app/map/map.component.html b/src/app/map/map.component.html
index 5cec91a..de9ca33 100644
--- a/src/app/map/map.component.html
+++ b/src/app/map/map.component.html
@@ -1,5 +1,5 @@
 <mat-toolbar>
-    <img src="/assets/icons/icon-72x72.png" height="35px" width="auto"> <small class="ml-2 text-muted">{{version}}</small>
+    <img src="/assets/images/logo.png" height="35px" width="auto"> <small class="ml-2 text-muted">{{version}}</small>
     <div class="ml-auto">
         <button mat-icon-button><mat-icon>room</mat-icon></button> <!-- Add Marker -->
         <button mat-icon-button><mat-icon>create</mat-icon></button> <!-- Create shape -->
@@ -15,7 +15,7 @@
         <button mat-icon-button><mat-icon>perm_identity</mat-icon></button>
     </div>
 </mat-toolbar>
-<agm-map class="map" [mapTypeId]="style" [zoomControl]="false" [streetViewControl]="false" (mapReady)="mapReady($event)">
+<agm-map class="map" [mapTypeId]="style" [zoomControl]="false" [streetViewControl]="false" (mapReady)="mapReady($event)" gestureHandling="greedy">
     <ng-container *ngIf="position">
         <agm-marker *ngIf="!position.heading" [markerClickable]="false" [latitude]="position.latitude" [longitude]="position.longitude" [iconUrl]="{url: '/assets/dot.png', anchor: {x: 11, y: 10}}"></agm-marker>
         <agm-marker *ngIf="position.heading" [markerClickable]="false" [latitude]="position.latitude" [longitude]="position.longitude" [iconUrl]="{url: '/assets/arrow.png', anchor: {x: 11, y: 13}, rotation: position.heading}"></agm-marker>
diff --git a/src/favicon.ico b/src/favicon.ico
deleted file mode 100644
index 8081c7c..0000000
Binary files a/src/favicon.ico and /dev/null differ
diff --git a/src/index.html b/src/index.html
index e93c5d3..43faae7 100644
--- a/src/index.html
+++ b/src/index.html
@@ -2,11 +2,11 @@
 <html lang="en">
 <head>
   <meta charset="utf-8">
-  <title>MapAlliance</title>
+  <title>Map Alliance</title>
   <base href="/">
 
   <meta name="viewport" content="width=device-width, initial-scale=1">
-  <link rel="icon" type="image/x-icon" href="favicon.ico">
+  <link rel="icon" type="image/x-icon" href="/assets/images/logo.png">
   <link href="https://fonts.googleapis.com/css?family=Roboto:300,400,500" rel="stylesheet">
   <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
   <link rel="manifest" href="manifest.webmanifest">
