diff --git a/src/editor.js b/src/editor.js
index 76da894..3691641 100644
--- a/src/editor.js
+++ b/src/editor.js
@@ -1,20 +1,20 @@
 var toolbar = [
-  {name: 'bold', action: toggleBold},
-  {name: 'italic', action: toggleItalic},
+  {name: 'bold', action: toggleBold, title: 'Bold'},
+  {name: 'italic', action: toggleItalic, title: 'Italics'},
   '|',
 
-  {name: 'quote', action: toggleBlockquote},
-  {name: 'unordered-list', action: toggleUnOrderedList},
-  {name: 'ordered-list', action: toggleOrderedList},
+  {name: 'quote', action: toggleBlockquote, title: 'Quote'},
+  {name: 'unordered-list', action: toggleUnOrderedList, title: 'Unordered List'},
+  {name: 'ordered-list', action: toggleOrderedList, title: 'Ordered List'},
   '|',
 
-  {name: 'link', action: drawLink},
-  {name: 'image', action: drawImage},
+  {name: 'link', action: drawLink, title: 'Link'},
+  {name: 'image', action: drawImage, title: 'Image'},
   '|',
 
-  {name: 'info', action: 'http://lab.lepture.com/editor/markdown'},
-  {name: 'preview', action: togglePreview},
-  {name: 'fullscreen', action: toggleFullScreen}
+  {name: 'info', action: 'http://lab.lepture.com/editor/markdown', title: 'Info'},
+  {name: 'preview', action: togglePreview, title: 'Preview'},
+  {name: 'fullscreen', action: toggleFullScreen, title: 'Fullscreen'}
 ];
 
 /**
diff --git a/src/intro.js b/src/intro.js
index c001077..1758695 100644
--- a/src/intro.js
+++ b/src/intro.js
@@ -32,16 +32,24 @@ function createIcon(name, options) {
   options = options || {};
   var el = document.createElement('a');
 
+  var title = '';
+
+  if (options.title) {
+    title = options.title;
+  }
+
   var shortcut = options.shortcut || shortcuts[name];
   if (shortcut) {
     shortcut = fixShortcut(shortcut);
-    el.title = shortcut;
-    el.title = el.title.replace('Cmd', '⌘');
+    shortcut = shortcut.replace('Cmd', '⌘');
     if (isMac) {
-      el.title = el.title.replace('Alt', '⌥');
+      shortcut = shortcut.replace('Alt', '⌥');
     }
+
+    title += (title == '') ? shortcut : ' (' + shortcut + ')';
   }
 
+  el.title = title;
   el.className = options.className || 'icon-' + name;
   return el;
 }