diff --git a/ionic/components/card/test/map/main.html b/ionic/components/card/test/map/main.html
index 96572af045..51b6fcb4a5 100644
--- a/ionic/components/card/test/map/main.html
+++ b/ionic/components/card/test/map/main.html
@@ -9,17 +9,17 @@
 
   <img src="data:image/gif;base64,R0lGODlhAQABAIAAAAAAAAAAACH5BAAAAAAALAAAAAABAAEAAAICTAEAOw==">
   <button fab fab-right fab-top>
-    <icon pin></icon>
+    <ion-icon name="pin"></ion-icon>
   </button>
 
   <ion-item>
-    <icon item-left large football></icon>
+    <ion-icon item-left large name="football"></ion-icon>
     <h2>Museum of Football</h2>
     <p>11 N. Way St, Madison, WI 53703</p>
   </ion-item>
 
   <ion-item>
-    <icon item-left large wine></icon>
+    <ion-icon item-left large name="wine"></ion-icon>
     <h2>Institute of Fine Cocktails</h2>
     <p>14 S. Hop Avenue, Madison, WI 53703</p>
   </ion-item>
@@ -28,7 +28,7 @@
     <span item-left>18 min</span>
     <span item-left>(2.6 mi)</span>
     <button primary clear item-right>
-      <icon navigate></icon>
+      <ion-icon name="navigate"></ion-icon>
       Start
     </button>
   </ion-item>
@@ -39,17 +39,17 @@
 
   <img src="data:image/gif;base64,R0lGODlhAQABAIAAAAAAAAAAACH5BAAAAAAALAAAAAABAAEAAAICTAEAOw==">
   <button danger fab fab-right fab-top>
-    <icon pin></icon>
+    <ion-icon name="pin"></ion-icon>
   </button>
 
   <ion-item>
-    <icon item-left large cloud></icon>
+    <ion-icon item-left large name="cloud"></ion-icon>
     <h2>Yoshi's Island</h2>
     <p>Iggy Koopa</p>
   </ion-item>
 
   <ion-item>
-    <icon item-left large leaf></icon>
+    <ion-icon item-left large name="leaf"></ion-icon>
     <h2>Forest of Illusion</h2>
     <p>Roy Koopa</p>
   </ion-item>
@@ -58,7 +58,7 @@
     <span item-left>3 hr</span>
     <span item-left>(4.8 mi)</span>
     <button danger clear item-right>
-      <icon navigate></icon>
+      <ion-icon name="navigate"></ion-icon>
       Start
     </button>
   </ion-item>
@@ -69,17 +69,17 @@
 
   <img src="data:image/gif;base64,R0lGODlhAQABAIAAAAAAAAAAACH5BAAAAAAALAAAAAABAAEAAAICTAEAOw==">
   <button secondary fab fab-right fab-top>
-    <icon pin></icon>
+    <ion-icon name="pin"></ion-icon>
   </button>
 
   <ion-item>
-    <icon item-left large information-circle></icon>
+    <ion-icon item-left large name="information-circle"></ion-icon>
     <h2>Museum of Information</h2>
     <p>44 Rue de Info, 75010 Paris, France</p>
   </ion-item>
 
   <ion-item>
-    <icon item-left large leaf></icon>
+    <ion-icon item-left large name="leaf"></ion-icon>
     <h2>General Pharmacy</h2>
     <p>1 Avenue Faux, 75010 Paris, France</p>
   </ion-item>
@@ -88,7 +88,7 @@
     <span item-left secondary>26 min</span>
     <span item-left>(8.1 mi)</span>
     <button secondary clear item-right>
-      <icon navigate></icon>
+      <ion-icon name="navigate"></ion-icon>
       Start
     </button>
   </ion-item>
diff --git a/ionic/components/card/test/social/main.html b/ionic/components/card/test/social/main.html
index 5486f8df90..7175493542 100644
--- a/ionic/components/card/test/social/main.html
+++ b/ionic/components/card/test/social/main.html
@@ -23,11 +23,11 @@
 
   <ion-item>
     <button primary clear item-left>
-      <icon thumbs-up></icon>
+      <ion-icon name="thumbs-up"></ion-icon>
       <div>12 Likes</div>
     </button>
     <button primary clear item-left>
-      <icon text></icon>
+      <ion-icon name="text"></ion-icon>
       <div>4 Comments</div>
     </button>
     <ion-note item-right>
@@ -56,11 +56,11 @@
 
   <ion-item>
     <button primary clear item-left>
-      <icon thumbs-up></icon>
+      <ion-icon name="thumbs-up"></ion-icon>
       <div>30 Likes</div>
     </button>
     <button primary clear item-left>
-      <icon text></icon>
+      <ion-icon name="text"></ion-icon>
       <div>64 Comments</div>
     </button>
     <ion-note item-right>
@@ -88,11 +88,11 @@
 
   <ion-item>
     <button primary clear item-left>
-      <icon thumbs-up></icon>
+      <ion-icon name="thumbs-up"></ion-icon>
       <div>46 Likes</div>
     </button>
     <button primary clear item-left>
-      <icon text></icon>
+      <ion-icon name="text"></ion-icon>
       <div>66 Comments</div>
     </button>
     <ion-note item-right>