diff --git a/atom/browser/native_window_views.cc b/atom/browser/native_window_views.cc
index 42a9e70dd0f2..3892b7181b94 100644
--- a/atom/browser/native_window_views.cc
+++ b/atom/browser/native_window_views.cc
@@ -613,6 +613,10 @@ views::NonClientFrameView* NativeWindowViews::CreateNonClientFrameView(
   return NULL;
 }
 
+gfx::ImageSkia NativeWindowViews::GetDevToolsWindowIcon() {
+  return GetWindowAppIcon();
+}
+
 void NativeWindowViews::HandleMouseDown() {
   // Hide menu bar when web view is clicked.
   if (menu_bar_autohide_ && menu_bar_visible_) {
diff --git a/atom/browser/native_window_views.h b/atom/browser/native_window_views.h
index ac4697c99228..3d81a68be224 100644
--- a/atom/browser/native_window_views.h
+++ b/atom/browser/native_window_views.h
@@ -105,6 +105,9 @@ class NativeWindowViews : public NativeWindow,
   virtual views::NonClientFrameView* CreateNonClientFrameView(
       views::Widget* widget) OVERRIDE;
 
+  // brightray::InspectableWebContentsDelegate:
+  virtual gfx::ImageSkia GetDevToolsWindowIcon() OVERRIDE;
+
   // content::WebContentsDelegate:
   virtual void HandleMouseDown() OVERRIDE;
   virtual void HandleKeyboardEvent(
diff --git a/vendor/brightray b/vendor/brightray
index dafc85799ca3..a108f0b10be6 160000
--- a/vendor/brightray
+++ b/vendor/brightray
@@ -1 +1 @@
-Subproject commit dafc85799ca31e3ddd7b5d0cc0ef7fbf38dcf88f
+Subproject commit a108f0b10be6c0058b03ba8e89addf6ea8289b7e