diff --git a/atom/browser/api/atom_api_web_contents.h b/atom/browser/api/atom_api_web_contents.h
index 484501df4..ea05715e5 100644
--- a/atom/browser/api/atom_api_web_contents.h
+++ b/atom/browser/api/atom_api_web_contents.h
@@ -7,7 +7,6 @@
 
 #include <string>
 #include <vector>
-#include <set>
 
 #include "atom/browser/api/event_emitter.h"
 #include "brightray/browser/default_web_contents_delegate.h"
diff --git a/atom/renderer/lib/web-view/web-view-attributes.coffee b/atom/renderer/lib/web-view/web-view-attributes.coffee
index fb0c0a1b8..0eff63d4b 100644
--- a/atom/renderer/lib/web-view/web-view-attributes.coffee
+++ b/atom/renderer/lib/web-view/web-view-attributes.coffee
@@ -158,9 +158,8 @@ class SrcAttribute extends WebViewAttribute
     domEvent = new Event('will-navigate')
     domEvent['url'] = @getValue()
     domEvent.cancelable = true
-    self = @
-    domEvent.preventDefault = () ->
-      self.setValueIgnoreMutation ''
+    domEvent.preventDefault = () =>
+      @setValueIgnoreMutation ''
     @webViewImpl.webviewNode.dispatchEvent domEvent
 
     unless @webViewImpl.guestInstanceId?
diff --git a/atom/renderer/lib/web-view/web-view.coffee b/atom/renderer/lib/web-view/web-view.coffee
index 51faeb796..38c9e761f 100644
--- a/atom/renderer/lib/web-view/web-view.coffee
+++ b/atom/renderer/lib/web-view/web-view.coffee
@@ -236,7 +236,6 @@ registerWebViewElement = ->
   methods = [
     "getUrl"
     "getTitle"
-    "getFavicon"
     "isLoading"
     "isWaitingForResponse"
     "stop"
@@ -277,6 +276,13 @@ registerWebViewElement = ->
       remote.getGuestWebContents(internal.guestInstanceId)[m]  args...
   proto[m] = createHandler m for m in methods
 
+  # Return dataUrl instead of nativeImage.
+  proto.getFavicon = (args...) ->
+    internal = v8Util.getHiddenValue this, 'internal'
+    return unless internal
+    favicon = remote.getGuestWebContents(internal.guestInstanceId)['getFavicon'] args...
+    favicon.toDataUrl()
+
   window.WebView = webFrame.registerEmbedderCustomElement 'webview',
     prototype: proto
 
diff --git a/docs/api/browser-window.md b/docs/api/browser-window.md
index 9a4bd9fc8..75540493d 100644
--- a/docs/api/browser-window.md
+++ b/docs/api/browser-window.md
@@ -671,7 +671,7 @@ Emitted when a redirect was received while requesting a resource.
 ### Event: 'page-favicon-updated'
 
 * `event` Event
-* `favicons` [String]
+* `favicons` Array - Array of Urls
 
 Emitted when page receives favicon urls.
 
@@ -728,7 +728,7 @@ Returns the title of web page.
 
 ### WebContents.getFavicon()
 
-Returns the favicon of web page as `nativeImage`.
+Returns the favicon of web page as [NativeImage](native-image.md).
 
 ### WebContents.isLoading()
 
diff --git a/docs/api/web-view-tag.md b/docs/api/web-view-tag.md
index 01be3dca0..3bd49c960 100644
--- a/docs/api/web-view-tag.md
+++ b/docs/api/web-view-tag.md
@@ -132,7 +132,7 @@ Returns the title of guest page.
 
 ### `<webview>`.getFavicon()
 
-Returns the favicon of guest page as `nativeImage`.
+Returns the favicon of guest page as dataUrl.
 
 ### `<webview>`.isLoading()
 
@@ -347,7 +347,7 @@ url.
 
 ### page-favicon-updated
 
-* `favicons` [String]
+* `favicons` Array - Array of Urls
 
 Fired when page receives favicon urls.