diff --git a/cms/static/css/tiny-mce.css b/cms/static/css/tiny-mce.css
index a6a6e8d727..8c69c4af75 100644
--- a/cms/static/css/tiny-mce.css
+++ b/cms/static/css/tiny-mce.css
@@ -117,6 +117,7 @@ code {
     font-family: monospace, serif;
     background: none;
     color: #3c3c3c;
+    padding: 0;
 }
 
 table {
diff --git a/common/lib/xmodule/xmodule/css/html/display.scss b/common/lib/xmodule/xmodule/css/html/display.scss
index 75c2ed75c5..18794dd0b7 100644
--- a/common/lib/xmodule/xmodule/css/html/display.scss
+++ b/common/lib/xmodule/xmodule/css/html/display.scss
@@ -100,6 +100,7 @@ code {
   color: $baseFontColor;
   font-family: monospace, serif;
   background: none;
+  padding: 0;
 }
 
 table {
diff --git a/common/lib/xmodule/xmodule/js/src/html/edit.coffee b/common/lib/xmodule/xmodule/js/src/html/edit.coffee
index 6318f002f1..6de8acb8fd 100644
--- a/common/lib/xmodule/xmodule/js/src/html/edit.coffee
+++ b/common/lib/xmodule/xmodule/js/src/html/edit.coffee
@@ -51,7 +51,7 @@ class @HTMLEditingDescriptor
   @setupTinyMCE: (ed) ->
     ed.addButton('wrapAsCode', {
       title : 'Code Block',
-      image : '/static/images/code.gif',
+      image : '/static/images/ico-tinymce-code.png',
       onclick : () ->
         ed.formatter.toggle('code')
     })
diff --git a/common/static/images/ico-tinymce-code.png b/common/static/images/ico-tinymce-code.png
new file mode 100644
index 0000000000..cc0b8e61f2
Binary files /dev/null and b/common/static/images/ico-tinymce-code.png differ