diff --git a/IPython/html/static/notebook/js/kernelselector.js b/IPython/html/static/notebook/js/kernelselector.js
index 46d4882..01f6d2a 100644
--- a/IPython/html/static/notebook/js/kernelselector.js
+++ b/IPython/html/static/notebook/js/kernelselector.js
@@ -85,6 +85,7 @@ define([
         this.events.on('spec_changed.Kernel', function(event, data) {
             that.current_selection = data.name;
             that.element.find("#current_kernel_spec").find('.kernel_name').text(data.display_name);
+            that.element.find("#current_kernel_logo").attr("src", "/kernelspecs/"+data.name+"/logo-64x64.png");
         });
         
         this.events.on('kernel_created.Session', function(event, data) {
@@ -96,6 +97,14 @@ define([
                 that.events.trigger('spec_changed.Kernel', ks);
             }
         });
+        
+        var logo_img = this.element.find("#current_kernel_logo")
+        logo_img.on("load", function() {
+            logo_img.show();
+        });
+        logo_img.on("error", function() {
+            logo_img.hide();
+        });
     };
 
     return {'KernelSelector': KernelSelector};
diff --git a/IPython/html/static/notebook/less/kernelselector.less b/IPython/html/static/notebook/less/kernelselector.less
index e3be7d3..44159c6 100644
--- a/IPython/html/static/notebook/less/kernelselector.less
+++ b/IPython/html/static/notebook/less/kernelselector.less
@@ -9,4 +9,9 @@
             margin-top:0px;
         }
     }
+    
+    & > img#current_kernel_logo {
+        width: 32px;
+        height: 32px;
+    }
 }
diff --git a/IPython/html/static/style/style.min.css b/IPython/html/static/style/style.min.css
index 3b2b2af..4eebfbe 100644
--- a/IPython/html/static/style/style.min.css
+++ b/IPython/html/static/style/style.min.css
@@ -9685,6 +9685,10 @@ fieldset[disabled] #kernel_selector_widget > button.active {
 #kernel_selector_widget > button > span.caret {
   margin-top: 0px;
 }
+#kernel_selector_widget > img#current_kernel_logo {
+  width: 32px;
+  height: 32px;
+}
 #menubar {
   box-sizing: border-box;
   -moz-box-sizing: border-box;
diff --git a/IPython/html/templates/notebook.html b/IPython/html/templates/notebook.html
index ec1c1e2..9c7547e 100644
--- a/IPython/html/templates/notebook.html
+++ b/IPython/html/templates/notebook.html
@@ -42,6 +42,7 @@ class="notebook_app"
 </span>
 
 <span id="kernel_selector_widget" class="pull-right dropdown">
+  <img id="current_kernel_logo"/>
   <button class="dropdown-toggle btn btn-sm navbar-btn" data-toggle="dropdown" type='button' id="current_kernel_spec">
     <span class='kernel_name'>Kernel</span>
     <span class="caret"></span> 
diff --git a/IPython/kernel/kernelspec.py b/IPython/kernel/kernelspec.py
index 58d3250..6424f34 100644
--- a/IPython/kernel/kernelspec.py
+++ b/IPython/kernel/kernelspec.py
@@ -109,8 +109,7 @@ class KernelSpecManager(HasTraits):
 
     @property
     def _native_kernel_resource_dir(self):
-        # TODO: This may be different when we actually have any resources
-        return os.path.dirname(__file__)
+        return pjoin(os.path.dirname(__file__), 'resources')
 
     def find_kernel_specs(self):
         """Returns a dict mapping kernel names to resource directories."""
@@ -128,7 +127,8 @@ class KernelSpecManager(HasTraits):
         Raises :exc:`NoSuchKernel` if the given kernel name is not found.
         """
         if kernel_name in {'python', NATIVE_KERNEL_NAME}:
-            return KernelSpec(self._native_kernel_resource_dir, **self._native_kernel_dict)
+            return KernelSpec(resource_dir=self._native_kernel_resource_dir,
+                              **self._native_kernel_dict)
 
         d = self.find_kernel_specs()
         try:
@@ -187,7 +187,9 @@ class KernelSpecManager(HasTraits):
         os.makedirs(path, mode=0o755)
         with open(pjoin(path, 'kernel.json'), 'w') as f:
             json.dump(self._native_kernel_dict, f, indent=1)
-        # TODO: Copy icons into directory
+        copy_from = self._native_kernel_resource_dir
+        for file in os.listdir(copy_from):
+            shutil.copy(pjoin(copy_from, file), path)
         return path
 
 def find_kernel_specs():
diff --git a/IPython/kernel/resources/logo-32x32.png b/IPython/kernel/resources/logo-32x32.png
new file mode 100644
index 0000000000000000000000000000000000000000..2877c9dcd90aaaf7851458beb3a0ba16ee1cbfdd
GIT binary patch
literal 1128
zc$@)f1eg1XP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800004b3#c}2nYxW
zd<bNS00009a7bBm0003p0003p0qGKj@Bjb+8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H11La9XK~z|U?UhYzRaFqje{=48lme!vNwGl+Vq1Byd9Q?sd_@xi
z(S-}65{X2Rkn#~FF^U0Al#r-VVvK?d7r;V=x+rLhis;4wh6IEXpqJZQ9x4b1L?md4
z+VbA{yWq7{C_)KIH=WhonK_x?%$YmKB+;MZ`ZfCizyJV{05G%B!2BzGp`^`4{{mnn
zAmA*pOVWW`0br6avvOcM@Ca}}umXrBwG;t%1E+w)z(n8y;1x;l0^GN7<7_z_ZBn#%
z?VQhhCa8UGTS-~RxfcMe;J@6ves0*)?*Js7D^|M;I3uaCD|ruTmh`Hmhk!SMWtYpa
zMNYQQd!j2V9Dn*kUY_mFYm@?aFTjMwYm@&0xCuD~l$n`z87^Mz+}E;x&QUXa(#*zR
z;<D;Zn`SL;S@+a#@9gJpUWUFsY2k)3Hw9p3RlpKphk9S5-viGS^?7i0SN4rK`r@8-
zbARe9z*}Z^95@E#fknLqN%|2eH?uNe3b5m<n3XGim);kE_kkI}5J?Y9I`KcT9|Ny*
zjV|5n44jg5R8q$c#BK#11wQP}>HN@lCN_L>H(cHW4k!mIfWc;VC-A$ZfBFE}Q$_(h
zC7tZedDkC<mNqp#QRoH$vcQ_6ejaE9z6D+@+V%sdubIv`kVqy!ny|QWXUp0-$AM|U
za)5D9Zx}jguxm6?;>}hAbR~!4BI-}+_qX7d0Zgc_E}L3aRod5c34n36wId6O#8R16
z2;K{V;5X&-9{|Tp+S3}x8+$vPO{b@|wzX{s_&b?={I8OdAAp^G0qCBAy1Kf_f%lVI
z<9JQBwzgV9FguLnH!|t;rycqH{A4mYJ&K~{`mtkE9&YnNP!UKg1Y4|7*y5d=Y|fRM
zG+aT@6oz3`pH5Hl(hToha}-5kHkFzsvr^2;54W|gmZWQ6fmv;~uC4*;bS{_s(@Bq+
znH8LCAelT7MbTG+_OPvORqK%>Z2*!gkUk@ye|c(ERjFVeiNxE^`{&KfVfNBR@3#u>
z$)-}1;W{%=fIVRxFDZV0lS!o>H0ky*414`09qee0<3pJF3&V!hc*uoe*lA{G>T7C7
zNIKl!-hS4+-zKxlZh%ZCGt5a@IX7lpP0esFm6MC2=<?eg1e<|nn0?)4l39>Rr)Orf
z**gFVX5Bl!HI74r`b;`K6R13x%blc$zXvoVlgWfZ&ZK4wg5-sK{ul4uhMs|87<K}`
z5(Hm#cgXu^<=pws&d!1*65ED!bQ}b5-mj9Ript6cla7aRyr9co1l`qHD0~MuxQH^D
uOgZ`da)bS?aolv>1AUNzO*jBB0Prs;CAwLxrCe|T0000<MNUMnLSTZL%LP;b

literal 0
Hc$@<O00001

diff --git a/IPython/kernel/resources/logo-64x64.png b/IPython/kernel/resources/logo-64x64.png
new file mode 100644
index 0000000000000000000000000000000000000000..6420dac80bde157fb773e27f9a12726d4b6d67af
GIT binary patch
literal 2264
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

literal 0
Hc$@<O00001