diff --git a/static/img/etherpad_lite_icons.png b/static/img/etherpad_lite_icons.png
index 606612313..590a49653 100644
Binary files a/static/img/etherpad_lite_icons.png and b/static/img/etherpad_lite_icons.png differ
diff --git a/static/js/pad_editbar.js b/static/js/pad_editbar.js
index ae1090687..2d05330a6 100644
--- a/static/js/pad_editbar.js
+++ b/static/js/pad_editbar.js
@@ -122,6 +122,10 @@ var padeditbar = (function()
         else if (cmd == 'save')
         {
           padsavedrevs.saveNow();
+        } 
+        else if (cmd == 'tglfont') 
+        {
+            pad.changeViewOption('useMonospaceFont', !(pad.padOptions.view&&pad.padOptions.view.useMonospaceFont));
         }
         else
         {
diff --git a/static/pad.html b/static/pad.html
index e79875009..970e6c410 100644
--- a/static/pad.html
+++ b/static/pad.html
@@ -76,6 +76,12 @@
     <div class="buttonicon" style="background-position:0px -86px"></div>
   </a>
 </li>
+<li class="separator"></li>
+<li onClick="window.pad&&pad.editbarClick('tglfont');return false;" >
+  <a id="monospace" title="toggle the font between monospace and normal">
+     <div class="buttonicon" style="background-position:0px -436px"></div>
+  </a>
+</li>
 </ul>
 
 <ul id="menu_right">