diff --git a/IPython/html/static/notebook/js/textcell.js b/IPython/html/static/notebook/js/textcell.js
index 71e604aa0..3f98da638 100644
--- a/IPython/html/static/notebook/js/textcell.js
+++ b/IPython/html/static/notebook/js/textcell.js
@@ -351,6 +351,9 @@ define([
     };
 
     HeadingCell.options_default = {
+        cm_config: {
+            theme: 'heading-1'
+        },
         placeholder: "Type Heading Here"
     };
 
@@ -362,6 +365,7 @@ define([
             this.level = data.level;
         }
         TextCell.prototype.fromJSON.apply(this, arguments);
+        this.code_mirror.setOption("theme", "heading-"+this.level);
     };
 
 
@@ -378,6 +382,8 @@ define([
      */
     HeadingCell.prototype.set_level = function (level) {
         this.level = level;
+        this.code_mirror.setOption("theme", "heading-"+level);
+
         if (this.rendered) {
             this.rendered = false;
             this.render();
diff --git a/IPython/html/static/notebook/less/textcell.less b/IPython/html/static/notebook/less/textcell.less
index 872142318..67e14ad19 100644
--- a/IPython/html/static/notebook/less/textcell.less
+++ b/IPython/html/static/notebook/less/textcell.less
@@ -35,3 +35,26 @@ h1,h2,h3,h4,h5,h6 {
 div.cell.text_cell.rendered {
     padding: 0px;
 }
+
+.cm-s-heading-1,
+.cm-s-heading-2,
+.cm-s-heading-3,
+.cm-s-heading-4,
+.cm-s-heading-5,
+.cm-s-heading-6 {
+    font-weight: bold;
+    font-family: @font-family-sans-serif;
+}
+
+.cm-s-heading-1 { font-size:150%; }
+.cm-s-heading-2 { font-size: 130%; }
+.cm-s-heading-3 { font-size: 120%; }
+.cm-s-heading-4 { font-size: 110%; }
+.cm-s-heading-5 {
+    font-size: 100%; 
+    font-style: italic;
+}
+.cm-s-heading-6 {
+    font-size: 90%; 
+    font-style: italic;
+}
diff --git a/IPython/html/static/style/ipython.min.css b/IPython/html/static/style/ipython.min.css
index 8f7d1b750..add3cd022 100644
--- a/IPython/html/static/style/ipython.min.css
+++ b/IPython/html/static/style/ipython.min.css
@@ -1130,6 +1130,35 @@ h6:hover .anchor-link {
 div.cell.text_cell.rendered {
   padding: 0px;
 }
+.cm-s-heading-1,
+.cm-s-heading-2,
+.cm-s-heading-3,
+.cm-s-heading-4,
+.cm-s-heading-5,
+.cm-s-heading-6 {
+  font-weight: bold;
+  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+}
+.cm-s-heading-1 {
+  font-size: 150%;
+}
+.cm-s-heading-2 {
+  font-size: 130%;
+}
+.cm-s-heading-3 {
+  font-size: 120%;
+}
+.cm-s-heading-4 {
+  font-size: 110%;
+}
+.cm-s-heading-5 {
+  font-size: 100%;
+  font-style: italic;
+}
+.cm-s-heading-6 {
+  font-size: 90%;
+  font-style: italic;
+}
 .widget-area {
   /*
     LESS file that styles IPython notebook widgets and the area they sit in.
diff --git a/IPython/html/static/style/style.min.css b/IPython/html/static/style/style.min.css
index 65c8bc093..5da6f14ce 100644
--- a/IPython/html/static/style/style.min.css
+++ b/IPython/html/static/style/style.min.css
@@ -8867,6 +8867,35 @@ h6:hover .anchor-link {
 div.cell.text_cell.rendered {
   padding: 0px;
 }
+.cm-s-heading-1,
+.cm-s-heading-2,
+.cm-s-heading-3,
+.cm-s-heading-4,
+.cm-s-heading-5,
+.cm-s-heading-6 {
+  font-weight: bold;
+  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+}
+.cm-s-heading-1 {
+  font-size: 150%;
+}
+.cm-s-heading-2 {
+  font-size: 130%;
+}
+.cm-s-heading-3 {
+  font-size: 120%;
+}
+.cm-s-heading-4 {
+  font-size: 110%;
+}
+.cm-s-heading-5 {
+  font-size: 100%;
+  font-style: italic;
+}
+.cm-s-heading-6 {
+  font-size: 90%;
+  font-style: italic;
+}
 .widget-area {
   /*
     LESS file that styles IPython notebook widgets and the area they sit in.