diff --git a/demos/segment/img/thumbnail-duckling-1.jpg b/demos/segment/img/thumbnail-duckling-1.jpg
deleted file mode 100644
index e66521322c..0000000000
Binary files a/demos/segment/img/thumbnail-duckling-1.jpg and /dev/null differ
diff --git a/demos/segment/img/thumbnail-duckling-2.jpg b/demos/segment/img/thumbnail-duckling-2.jpg
deleted file mode 100644
index 7d19035c43..0000000000
Binary files a/demos/segment/img/thumbnail-duckling-2.jpg and /dev/null differ
diff --git a/demos/segment/img/thumbnail-duckling-3.jpg b/demos/segment/img/thumbnail-duckling-3.jpg
deleted file mode 100644
index cda1e2db93..0000000000
Binary files a/demos/segment/img/thumbnail-duckling-3.jpg and /dev/null differ
diff --git a/demos/segment/img/thumbnail-duckling-4.jpg b/demos/segment/img/thumbnail-duckling-4.jpg
deleted file mode 100644
index 73c95d4e2a..0000000000
Binary files a/demos/segment/img/thumbnail-duckling-4.jpg and /dev/null differ
diff --git a/demos/segment/img/thumbnail-kitten-1.jpg b/demos/segment/img/thumbnail-kitten-1.jpg
deleted file mode 100644
index 510e3ea373..0000000000
Binary files a/demos/segment/img/thumbnail-kitten-1.jpg and /dev/null differ
diff --git a/demos/segment/img/thumbnail-kitten-2.jpg b/demos/segment/img/thumbnail-kitten-2.jpg
deleted file mode 100644
index add676fa1c..0000000000
Binary files a/demos/segment/img/thumbnail-kitten-2.jpg and /dev/null differ
diff --git a/demos/segment/img/thumbnail-kitten-3.jpg b/demos/segment/img/thumbnail-kitten-3.jpg
deleted file mode 100644
index 5046c7431c..0000000000
Binary files a/demos/segment/img/thumbnail-kitten-3.jpg and /dev/null differ
diff --git a/demos/segment/img/thumbnail-kitten-4.jpg b/demos/segment/img/thumbnail-kitten-4.jpg
deleted file mode 100644
index dd510043f5..0000000000
Binary files a/demos/segment/img/thumbnail-kitten-4.jpg and /dev/null differ
diff --git a/demos/segment/img/thumbnail-puppy-1.jpg b/demos/segment/img/thumbnail-puppy-1.jpg
deleted file mode 100644
index 8e093637a2..0000000000
Binary files a/demos/segment/img/thumbnail-puppy-1.jpg and /dev/null differ
diff --git a/demos/segment/img/thumbnail-puppy-2.jpg b/demos/segment/img/thumbnail-puppy-2.jpg
deleted file mode 100644
index 89b5ced668..0000000000
Binary files a/demos/segment/img/thumbnail-puppy-2.jpg and /dev/null differ
diff --git a/demos/segment/img/thumbnail-puppy-3.jpg b/demos/segment/img/thumbnail-puppy-3.jpg
deleted file mode 100644
index 2a6e47f608..0000000000
Binary files a/demos/segment/img/thumbnail-puppy-3.jpg and /dev/null differ
diff --git a/demos/segment/img/thumbnail-puppy-4.jpg b/demos/segment/img/thumbnail-puppy-4.jpg
deleted file mode 100644
index a234f235ca..0000000000
Binary files a/demos/segment/img/thumbnail-puppy-4.jpg and /dev/null differ
diff --git a/demos/segment/index.ts b/demos/segment/index.ts
index f4303a87c0..b2aa44ac4c 100644
--- a/demos/segment/index.ts
+++ b/demos/segment/index.ts
@@ -7,18 +7,83 @@ import { ionicBootstrap } from 'ionic-angular';
   templateUrl: 'main.html'
 })
 class ApiDemoPage {
-  appType = "paid";
-  safari = "links";
-  news = "local";
-  favorites = "recent";
+  appType = "Paid";
+  safari = "Shared Links";
+  weather = "sunny";
 
-  purchased = "all";
-  mapStyle = "sat";
-  teslaModels = "X";
+  apps = {
+    "Paid": [
+      {
+        name: 'Monopoly',
+        price: '$0.99'
+      },
+      {
+        name: 'Angry Birds',
+        price: '$2.99'
+      }
+    ],
+    "Free": [
+      {
+        name: 'Snapchat',
+        price: 'GET'
+      },
+      {
+        name: 'Instagram',
+        price: 'OPEN'
+      }
+    ],
+    "Top": [
+      {
+        name: 'Spotify',
+        price: 'OPEN'
+      },
+      {
+        name: 'Pandora',
+        price: 'GET'
+      }
+    ]
+  };
 
-  pet = "puppies";
-  calendar = "day";
-  proxy = "auto";
+  items = {
+    "Bookmarks": [
+      {
+        name: 'Favorites',
+        icon: 'ios-star-outline'
+      },
+      {
+        name: 'History',
+        icon: 'ios-clock-outline'
+      }
+    ],
+    "Reading List": [
+      {
+        name: 'Terms of Service',
+        icon: 'create'
+      },
+      {
+        name: 'User Guide',
+        icon: 'book'
+      }
+    ],
+    "Shared Links": [
+      {
+        name: 'Ionic Framework',
+        icon: 'ionic'
+      },
+      {
+        name: 'Learn Angular',
+        icon: 'logo-angular'
+      }
+    ]
+  };
+
+  getItems(type) {
+    return this.apps[type];
+  }
+
+  getSafariItems(type) {
+    return this.items[type];
+  }
 }
 
 
diff --git a/demos/segment/main.html b/demos/segment/main.html
index 79ecbd1521..f7c9d23245 100644
--- a/demos/segment/main.html
+++ b/demos/segment/main.html
@@ -1,147 +1,75 @@
 <ion-header>
 
-  <ion-navbar>
+  <ion-navbar no-border-bottom>
     <ion-title>Segment</ion-title>
   </ion-navbar>
 
   <ion-toolbar no-border-top>
     <ion-segment [(ngModel)]="appType">
-      <ion-segment-button value="paid">
+      <ion-segment-button value="Paid">
         Paid
       </ion-segment-button>
-      <ion-segment-button value="free">
+      <ion-segment-button value="Free">
         Free
       </ion-segment-button>
-      <ion-segment-button value="top">
+      <ion-segment-button value="Top">
         Top
       </ion-segment-button>
     </ion-segment>
   </ion-toolbar>
 
-  <ion-toolbar no-border-top>
-    <ion-segment [(ngModel)]="news" secondary>
-      <ion-segment-button value="worldwide">
-        Worldwide
-      </ion-segment-button>
-      <ion-segment-button value="local">
-        Local
-      </ion-segment-button>
-      <ion-segment-button value="headlines">
-        Headlines
-      </ion-segment-button>
-    </ion-segment>
-  </ion-toolbar>
-
-  <ion-toolbar no-border-top>
-    <ion-segment [(ngModel)]="safari" dark class="icon-segment-demo">
-      <ion-segment-button value="bookmarks">
-        <ion-icon name="book"></ion-icon>
-      </ion-segment-button>
-      <ion-segment-button value="history">
-        <ion-icon ios="ios-glasses-outline" md="md-glasses"></ion-icon>
-      </ion-segment-button>
-      <ion-segment-button value="links">
-        <ion-icon ios="ios-at-outline" md="md-at"></ion-icon>
-      </ion-segment-button>
-    </ion-segment>
-  </ion-toolbar>
-
-  <ion-toolbar no-border-top>
-    <ion-segment [(ngModel)]="favorites" danger>
-      <ion-segment-button value="featured">
-        Featured
-      </ion-segment-button>
-      <ion-segment-button value="recent">
-        Recent
-      </ion-segment-button>
-    </ion-segment>
-  </ion-toolbar>
-
 </ion-header>
 
+<ion-content class="outer-content">
+  <ion-list>
+    <ion-list-header>{{ appType }}</ion-list-header>
+    <ion-item *ngFor="let item of getItems(appType)">
+      {{ item.name }}
+      <button outline item-right>{{ item.price }}</button>
+    </ion-item>
+  </ion-list>
 
-<ion-content padding>
-
-  <p>Segments can be placed in a toolbar or anywhere in the content.</p>
-
-  <ion-segment [(ngModel)]="purchased" primary margin-bottom>
-    <ion-segment-button value="all">
-      All
-    </ion-segment-button>
-    <ion-segment-button value="not">
-      Not on This Phone
-    </ion-segment-button>
-  </ion-segment>
-
-  <ion-segment [(ngModel)]="mapStyle" secondary margin-bottom>
-    <ion-segment-button value="standard">
-      Standard
-    </ion-segment-button>
-    <ion-segment-button value="hybrid">
-      Hybrid
-    </ion-segment-button>
-    <ion-segment-button value="sat">
-      Satellite
-    </ion-segment-button>
-  </ion-segment>
-
-  <ion-segment [(ngModel)]="teslaModels" danger margin-bottom>
-    <ion-segment-button value="S">
-      Model S
-    </ion-segment-button>
-    <ion-segment-button value="X">
-      Model X
-    </ion-segment-button>
-    <ion-segment-button value="3">
-      Model 3
-    </ion-segment-button>
-  </ion-segment>
-
+  <ion-card>
+    <ion-card-header>
+      {{ safari }}
+    </ion-card-header>
+    <ion-card-content>
+      <ion-segment [(ngModel)]="safari" dark>
+        <ion-segment-button value="Bookmarks">
+          <ion-icon name="book"></ion-icon>
+        </ion-segment-button>
+        <ion-segment-button value="Reading List">
+          <ion-icon ios="ios-glasses-outline" md="md-glasses"></ion-icon>
+        </ion-segment-button>
+        <ion-segment-button value="Shared Links">
+          <ion-icon ios="ios-at-outline" md="md-at"></ion-icon>
+        </ion-segment-button>
+      </ion-segment>
+      <ion-list style="margin: 0" inset>
+        <button ion-item *ngFor="let sItem of getSafariItems(safari)">
+          <ion-icon item-left [name]="sItem.icon" primary></ion-icon>
+          {{ sItem.name }}
+        </button>
+      </ion-list>
+    </ion-card-content>
+  </ion-card>
 </ion-content>
 
-
 <ion-footer>
-
-  <ion-toolbar no-border-bottom primary>
-    <ion-segment [(ngModel)]="pet" light>
-      <ion-segment-button value="puppies">
-        Puppies
+  <ion-toolbar no-border-bottom>
+    <ion-title>
+      Weather: {{ weather == 'sunny' ? '96' : '77' }}°
+      <ion-icon [name]="weather" danger></ion-icon>
+    </ion-title>
+  </ion-toolbar>
+  <ion-toolbar no-border-top no-border-bottom>
+    <ion-segment [(ngModel)]="weather" danger>
+      <ion-segment-button value="sunny">
+        Sunny
       </ion-segment-button>
-      <ion-segment-button value="kittens">
-        Kittens
-      </ion-segment-button>
-      <ion-segment-button value="ducklings">
-        Ducklings
+      <ion-segment-button value="rainy" checked>
+        Rainy
       </ion-segment-button>
     </ion-segment>
   </ion-toolbar>
-
-  <ion-toolbar no-border-bottom dark>
-    <ion-segment [(ngModel)]="calendar" primary>
-      <ion-segment-button value="list">
-        List
-      </ion-segment-button>
-      <ion-segment-button value="day">
-        Day
-      </ion-segment-button>
-      <ion-segment-button value="month" checked>
-        Month
-      </ion-segment-button>
-    </ion-segment>
-  </ion-toolbar>
-
-  <ion-toolbar no-border-bottom danger>
-    <ion-segment [(ngModel)]="proxy" light>
-      <ion-segment-button value="off">
-        Off
-      </ion-segment-button>
-      <ion-segment-button value="manual">
-        Manual
-      </ion-segment-button>
-      <ion-segment-button value="auto">
-        Auto
-      </ion-segment-button>
-    </ion-segment>
-  </ion-toolbar>
-
 </ion-footer>
diff --git a/src/components/segment/segment.ts b/src/components/segment/segment.ts
index eeaccb6ce5..203cdd9d2f 100644
--- a/src/components/segment/segment.ts
+++ b/src/components/segment/segment.ts
@@ -8,34 +8,31 @@ import { isPresent, isTrueProperty } from '../../util/util';
  * @name SegmentButton
  * @description
  * The child buttons of the `ion-segment` component. Each `ion-segment-button` must have a value.
+ *
  * @usage
+ *
  * ```html
- * <ion-segment [(ngModel)]="relationship" primary>
- *   <ion-segment-button value="friends" (ionSelect)="selectedFriends()">
- *     Friends
- *   </ion-segment-button>
- *   <ion-segment-button value="enemies" (ionSelect)="selectedEnemies()">
- *     Enemies
- *   </ion-segment-button>
- * </ion-segment>
- *```
- *
- * Or with `FormBuilder`
- *
- *```html
- * <form [ngFormModel]="myForm">
- *   <ion-segment ngControl="mapStyle" danger>
- *     <ion-segment-button value="standard">
- *       Standard
+ * <ion-content>
+ *   <!-- Segment buttons with icons -->
+ *   <ion-segment [(ngModel)]="icons" secondary>
+ *     <ion-segment-button value="camera">
+ *       <ion-icon name="camera"></ion-icon>
  *     </ion-segment-button>
- *     <ion-segment-button value="hybrid">
- *       Hybrid
- *     </ion-segment-button>
- *     <ion-segment-button value="sat">
- *       Satellite
+ *     <ion-segment-button value="bookmark">
+ *       <ion-icon name="bookmark"></ion-icon>
  *     </ion-segment-button>
  *   </ion-segment>
- * </form>
+ *
+ *   <!-- Segment buttons with text -->
+ *   <ion-segment [(ngModel)]="relationship" primary>
+ *     <ion-segment-button value="friends" (ionSelect)="selectedFriends()">
+ *       Friends
+ *     </ion-segment-button>
+ *     <ion-segment-button value="enemies" (ionSelect)="selectedEnemies()">
+ *       Enemies
+ *     </ion-segment-button>
+ *   </ion-segment>
+ * </ion-content>
  * ```
  *
  *
@@ -128,34 +125,47 @@ export class SegmentButton {
  * You could use Angular 2's `ngModel` or `FormBuilder` API. For an overview on how `FormBuilder` works, checkout [Angular 2 Forms](http://learnangular2.com/forms/), or [Angular FormBuilder](https://angular.io/docs/ts/latest/api/common/FormBuilder-class.html)
  *
  *
- * @usage
  * ```html
- * <ion-segment [(ngModel)]="relationship" (ionChange)="onSegmentChanged($event)" danger>
- *   <ion-segment-button value="friends">
- *     Friends
- *   </ion-segment-button>
- *   <ion-segment-button value="enemies">
- *     Enemies
- *   </ion-segment-button>
- * </ion-segment>
- *```
+ * <!-- Segment in a header -->
+ * <ion-header>
+ *   <ion-toolbar>
+ *     <ion-segment [(ngModel)]="icons" secondary>
+ *       <ion-segment-button value="camera">
+ *         <ion-icon name="camera"></ion-icon>
+ *       </ion-segment-button>
+ *       <ion-segment-button value="bookmark">
+ *         <ion-icon name="bookmark"></ion-icon>
+ *       </ion-segment-button>
+ *     </ion-segment>
+ *   </ion-toolbar>
+ * </ion-header>
  *
- * Or with `FormBuilder`
- *
- *```html
- * <form [ngFormModel]="myForm">
- *   <ion-segment ngControl="mapStyle" danger>
- *     <ion-segment-button value="standard">
- *       Standard
+ * <ion-content>
+ *   <!-- Segment in content -->
+ *   <ion-segment [(ngModel)]="relationship" primary>
+ *     <ion-segment-button value="friends" (ionSelect)="selectedFriends()">
+ *       Friends
  *     </ion-segment-button>
- *     <ion-segment-button value="hybrid">
- *       Hybrid
- *     </ion-segment-button>
- *     <ion-segment-button value="sat">
- *       Satellite
+ *     <ion-segment-button value="enemies" (ionSelect)="selectedEnemies()">
+ *       Enemies
  *     </ion-segment-button>
  *   </ion-segment>
- * </form>
+ *
+ *   <!-- Segment in a form -->
+ *   <form [ngFormModel]="myForm">
+ *     <ion-segment ngControl="mapStyle" danger>
+ *       <ion-segment-button value="standard">
+ *         Standard
+ *       </ion-segment-button>
+ *       <ion-segment-button value="hybrid">
+ *         Hybrid
+ *       </ion-segment-button>
+ *       <ion-segment-button value="sat">
+ *         Satellite
+ *       </ion-segment-button>
+ *     </ion-segment>
+ *   </form>
+ * </ion-content>
  * ```
  *
  *