diff --git a/docs/app/partials/menu-toggle.tmpl.html b/docs/app/partials/menu-toggle.tmpl.html
index 7c3dea16df0..a41c944d17d 100644
--- a/docs/app/partials/menu-toggle.tmpl.html
+++ b/docs/app/partials/menu-toggle.tmpl.html
@@ -7,7 +7,7 @@
     <span flex=""></span>
     <span aria-hidden="true" class="md-toggle-icon"
     ng-class="{'toggled' : isOpen()}">
-      <md-icon md-svg-src="toggle-arrow"></md-icon>
+      <md-icon md-svg-src="md-toggle-arrow"></md-icon>
     </span>
   </div>
   <span class="md-visually-hidden">
diff --git a/docs/config/template/index.template.html b/docs/config/template/index.template.html
index b75c87664f6..6a8ba8c40b7 100644
--- a/docs/config/template/index.template.html
+++ b/docs/config/template/index.template.html
@@ -24,7 +24,7 @@
     <md-toolbar class="md-whiteframe-glow-z2">
       <h1 class="md-toolbar-tools">
         <a ng-href="#/" layout="row" flex class="docs-logo">
-          <md-icon md-svg-src="menu"></md-icon>
+          <md-icon md-svg-src="md-menu"></md-icon>
           <div class="docs-logotype">Material Design</div>
         </a>
       </h1>
diff --git a/src/components/autocomplete/js/autocompleteDirective.js b/src/components/autocomplete/js/autocompleteDirective.js
index a4016ed8705..5f636d14968 100644
--- a/src/components/autocomplete/js/autocompleteDirective.js
+++ b/src/components/autocomplete/js/autocompleteDirective.js
@@ -108,7 +108,7 @@ function MdAutocomplete ($mdTheming, $mdUtil) {
               tabindex="-1"\
               ng-if="$mdAutocompleteCtrl.scope.searchText && !isDisabled"\
               ng-click="$mdAutocompleteCtrl.clear()">\
-            <md-icon md-svg-icon="cancel"></md-icon>\
+            <md-icon md-svg-icon="md-cancel"></md-icon>\
             <span class="md-visually-hidden">Clear</span>\
           </button>\
           <md-progress-linear\
diff --git a/src/components/chips/demoBasicUsage/index.html b/src/components/chips/demoBasicUsage/index.html
index e6e397ccf8d..2f113908b85 100644
--- a/src/components/chips/demoBasicUsage/index.html
+++ b/src/components/chips/demoBasicUsage/index.html
@@ -35,7 +35,7 @@
         </span>
       </md-chip-template>
       <button md-chip-remove class="md-primary vegetablechip">
-        <md-icon md-svg-icon="close"></md-icon>
+        <md-icon md-svg-icon="md-close"></md-icon>
       </button>
     </md-chips>
 
diff --git a/src/components/chips/js/chipsDirective.js b/src/components/chips/js/chipsDirective.js
index 1732eeb3a05..a62b6d4e7b1 100644
--- a/src/components/chips/js/chipsDirective.js
+++ b/src/components/chips/js/chipsDirective.js
@@ -131,7 +131,7 @@ var CHIP_REMOVE_TEMPLATE = '\
         ng-click="$mdChipsCtrl.removeChipAndFocusInput($$replacedScope.$index)"\
         aria-hidden="true"\
         tabindex="-1">\
-      <md-icon md-svg-icon="close"></md-icon>\
+      <md-icon md-svg-icon="md-close"></md-icon>\
       <span class="md-visually-hidden">\
         {{$mdChipsCtrl.deleteButtonLabel}}\
       </span>\
diff --git a/src/components/icon/iconService.js b/src/components/icon/iconService.js
index aece9eff938..f47b4167c9c 100644
--- a/src/components/icon/iconService.js
+++ b/src/components/icon/iconService.js
@@ -213,28 +213,28 @@
      var iconProvider = this;
      var svgRegistry = [
        {
-         id : 'tabs-arrow',
-         url: 'tabs-arrow.svg',
+         id : 'md-tabs-arrow',
+         url: 'md-tabs-arrow.svg',
          svg: '<svg version="1.1" x="0px" y="0px" viewBox="0 0 24 24"><g><polygon points="15.4,7.4 14,6 8,12 14,18 15.4,16.6 10.8,12 "/></g></svg>'
        },
        {
-         id : 'close',
-         url: 'close.svg',
+         id : 'md-close',
+         url: 'md-close.svg',
          svg: '<svg version="1.1" x="0px" y="0px" viewBox="0 0 24 24"><g><path d="M19 6.41l-1.41-1.41-5.59 5.59-5.59-5.59-1.41 1.41 5.59 5.59-5.59 5.59 1.41 1.41 5.59-5.59 5.59 5.59 1.41-1.41-5.59-5.59z"/></g></svg>'
        },
        {
-         id:  'cancel',
-         url: 'cancel.svg',
+         id:  'md-cancel',
+         url: 'md-cancel.svg',
          svg: '<svg version="1.1" x="0px" y="0px" viewBox="0 0 24 24"><g><path d="M12 2c-5.53 0-10 4.47-10 10s4.47 10 10 10 10-4.47 10-10-4.47-10-10-10zm5 13.59l-1.41 1.41-3.59-3.59-3.59 3.59-1.41-1.41 3.59-3.59-3.59-3.59 1.41-1.41 3.59 3.59 3.59-3.59 1.41 1.41-3.59 3.59 3.59 3.59z"/></g></svg>'
        },
        {
-         id:  'menu',
-         url: 'menu.svg',
+         id:  'md-menu',
+         url: 'md-menu.svg',
          svg: '<svg version="1.1" x="0px" y="0px" viewBox="0 0 100 100"><path d="M 50 0 L 100 14 L 92 80 L 50 100 L 8 80 L 0 14 Z" fill="#b2b2b2"></path><path d="M 50 5 L 6 18 L 13.5 77 L 50 94 Z" fill="#E42939"></path><path d="M 50 5 L 94 18 L 86.5 77 L 50 94 Z" fill="#B72833"></path><path d="M 50 7 L 83 75 L 72 75 L 65 59 L 50 59 L 50 50 L 61 50 L 50 26 Z" fill="#b2b2b2"></path><path d="M 50 7 L 17 75 L 28 75 L 35 59 L 50 59 L 50 50 L 39 50 L 50 26 Z" fill="#fff"></path></svg>'
        },
        {
-         id:  'toggle-arrow',
-         url: 'toggle-arrow-svg',
+         id:  'md-toggle-arrow',
+         url: 'md-toggle-arrow-svg',
          svg: '<svg version="1.1" x="0px" y="0px" viewBox="0 0 48 48"><path d="M24 16l-12 12 2.83 2.83 9.17-9.17 9.17 9.17 2.83-2.83z"/><path d="M0 0h48v48h-48z" fill="none"/></svg>'
        }
      ];
diff --git a/src/components/tabs/js/tabsDirective.js b/src/components/tabs/js/tabsDirective.js
index 9141ebdeb2f..82ca41cd05e 100644
--- a/src/components/tabs/js/tabsDirective.js
+++ b/src/components/tabs/js/tabsDirective.js
@@ -107,7 +107,7 @@ function MdTabs ($mdTheming, $mdUtil, $compile) {
               ng-class="{ \'md-disabled\': !$mdTabsCtrl.canPageBack() }"\
               ng-if="$mdTabsCtrl.shouldPaginate()"\
               ng-click="$mdTabsCtrl.previousPage()">\
-            <md-icon md-svg-icon="tabs-arrow"></md-icon>\
+            <md-icon md-svg-icon="md-tabs-arrow"></md-icon>\
           </md-prev-button>\
           <md-next-button\
               tabindex="-1"\
@@ -117,7 +117,7 @@ function MdTabs ($mdTheming, $mdUtil, $compile) {
               ng-class="{ \'md-disabled\': !$mdTabsCtrl.canPageForward() }"\
               ng-if="$mdTabsCtrl.shouldPaginate()"\
               ng-click="$mdTabsCtrl.nextPage()">\
-            <md-icon md-svg-icon="tabs-arrow"></md-icon>\
+            <md-icon md-svg-icon="md-tabs-arrow"></md-icon>\
           </md-next-button>\
           <md-tabs-canvas\
               tabindex="0"\