diff --git a/atom.gyp b/atom.gyp
index 000e031ce33..51f0467891b 100644
--- a/atom.gyp
+++ b/atom.gyp
@@ -116,6 +116,9 @@
           ],
         }],  # OS!="mac"
         ['OS=="win"', {
+          'include_dirs': [
+            '<(libchromiumcontent_dir)/gen/ui/resources',
+          ],
           'copies': [
             {
               'variables': {
diff --git a/atom/browser/resources/win/atom.rc b/atom/browser/resources/win/atom.rc
index fb977dd983c..2e8ed222f43 100644
--- a/atom/browser/resources/win/atom.rc
+++ b/atom/browser/resources/win/atom.rc
@@ -1,6 +1,12 @@
 // Microsoft Visual C++ generated resource script.
 //
+#include "grit\\ui_unscaled_resources.h"
 #include "resource.h"
+#include <winresrc.h>
+#ifdef IDC_STATIC
+#undef IDC_STATIC
+#endif
+#define IDC_STATIC (-1)
 
 #define APSTUDIO_READONLY_SYMBOLS
 /////////////////////////////////////////////////////////////////////////////
@@ -106,3 +112,28 @@ END
 IDR_MAINFRAME           ICON                    "atom.ico"
 /////////////////////////////////////////////////////////////////////////////
 
+/////////////////////////////////////////////////////////////////////////////
+//
+// Cursors
+//
+IDC_ALIAS          CURSOR             "ui\\resources\\cursors\\aliasb.cur"
+IDC_CELL           CURSOR             "ui\\resources\\cursors\\cell.cur"
+IDC_COLRESIZE      CURSOR             "ui\\resources\\cursors\\col_resize.cur"
+IDC_COPYCUR        CURSOR             "ui\\resources\\cursors\\copy.cur"
+IDC_CURSOR_NONE    CURSOR             "ui\\resources\\cursors\\none.cur"
+IDC_HAND_GRAB      CURSOR             "ui\\resources\\cursors\\hand_grab.cur"
+IDC_HAND_GRABBING  CURSOR             "ui\\resources\\cursors\\hand_grabbing.cur"
+IDC_PAN_EAST       CURSOR             "ui\\resources\\cursors\\pan_east.cur"
+IDC_PAN_MIDDLE     CURSOR             "ui\\resources\\cursors\\pan_middle.cur"
+IDC_PAN_NORTH      CURSOR             "ui\\resources\\cursors\\pan_north.cur"
+IDC_PAN_NORTH_EAST CURSOR             "ui\\resources\\cursors\\pan_north_east.cur"
+IDC_PAN_NORTH_WEST CURSOR             "ui\\resources\\cursors\\pan_north_west.cur"
+IDC_PAN_SOUTH      CURSOR             "ui\\resources\\cursors\\pan_south.cur"
+IDC_PAN_SOUTH_EAST CURSOR             "ui\\resources\\cursors\\pan_south_east.cur"
+IDC_PAN_SOUTH_WEST CURSOR             "ui\\resources\\cursors\\pan_south_west.cur"
+IDC_PAN_WEST       CURSOR             "ui\\resources\\cursors\\pan_west.cur"
+IDC_ROWRESIZE      CURSOR             "ui\\resources\\cursors\\row_resize.cur"
+IDC_VERTICALTEXT   CURSOR             "ui\\resources\\cursors\\vertical_text.cur"
+IDC_ZOOMIN         CURSOR             "ui\\resources\\cursors\\zoom_in.cur"
+IDC_ZOOMOUT        CURSOR             "ui\\resources\\cursors\\zoom_out.cur"
+/////////////////////////////////////////////////////////////////////////////
diff --git a/filenames.gypi b/filenames.gypi
index 8d3248e0009..3f299c066a6 100644
--- a/filenames.gypi
+++ b/filenames.gypi
@@ -423,6 +423,27 @@
           'atom/browser/resources/win/atom.ico',
           'atom/browser/resources/win/atom.rc',
           '<(libchromiumcontent_src_dir)/content/app/startup_helper_win.cc',
+          # Cursors.
+          '<(libchromiumcontent_src_dir)/ui/resources/cursors/aliasb.cur',
+          '<(libchromiumcontent_src_dir)/ui/resources/cursors/cell.cur',
+          '<(libchromiumcontent_src_dir)/ui/resources/cursors/col_resize.cur',
+          '<(libchromiumcontent_src_dir)/ui/resources/cursors/copy.cur',
+          '<(libchromiumcontent_src_dir)/ui/resources/cursors/hand_grab.cur',
+          '<(libchromiumcontent_src_dir)/ui/resources/cursors/hand_grabbing.cur',
+          '<(libchromiumcontent_src_dir)/ui/resources/cursors/none.cur',
+          '<(libchromiumcontent_src_dir)/ui/resources/cursors/pan_east.cur',
+          '<(libchromiumcontent_src_dir)/ui/resources/cursors/pan_middle.cur',
+          '<(libchromiumcontent_src_dir)/ui/resources/cursors/pan_north.cur',
+          '<(libchromiumcontent_src_dir)/ui/resources/cursors/pan_north_east.cur',
+          '<(libchromiumcontent_src_dir)/ui/resources/cursors/pan_north_west.cur',
+          '<(libchromiumcontent_src_dir)/ui/resources/cursors/pan_south.cur',
+          '<(libchromiumcontent_src_dir)/ui/resources/cursors/pan_south_east.cur',
+          '<(libchromiumcontent_src_dir)/ui/resources/cursors/pan_south_west.cur',
+          '<(libchromiumcontent_src_dir)/ui/resources/cursors/pan_west.cur',
+          '<(libchromiumcontent_src_dir)/ui/resources/cursors/row_resize.cur',
+          '<(libchromiumcontent_src_dir)/ui/resources/cursors/vertical_text.cur',
+          '<(libchromiumcontent_src_dir)/ui/resources/cursors/zoom_in.cur',
+          '<(libchromiumcontent_src_dir)/ui/resources/cursors/zoom_out.cur',
         ],
       }],  # OS=="win"
     ],
diff --git a/vendor/brightray b/vendor/brightray
index 706799700b6..74d22719998 160000
--- a/vendor/brightray
+++ b/vendor/brightray
@@ -1 +1 @@
-Subproject commit 706799700b6cbdd8c6657e7253f0395b38412d57
+Subproject commit 74d22719998de8c5b204fbc3fb564f91c20ef8cb