diff --git a/docs/app/Examples/elements/Image/ImageExampes.js b/docs/app/Examples/elements/Image/ImageExampes.js
new file mode 100644
index 0000000000..3f5bcb6933
--- /dev/null
+++ b/docs/app/Examples/elements/Image/ImageExampes.js
@@ -0,0 +1,12 @@
+import React, { Component } from 'react'
+import ImageTypesExamples from './Types/ImageTypesExamples'
+
+export default class ImageExamples extends Component {
+  render() {
+    return (
+      <div>
+        <ImageTypesExamples />
+      </div>
+    )
+  }
+}
diff --git a/docs/app/Examples/elements/Image/Types/ImageAlignedExample.js b/docs/app/Examples/elements/Image/Types/ImageAlignedExample.js
new file mode 100644
index 0000000000..2920890848
--- /dev/null
+++ b/docs/app/Examples/elements/Image/Types/ImageAlignedExample.js
@@ -0,0 +1,13 @@
+import React, { Component } from 'react'
+import { Image } from 'stardust'
+
+export default class ImageAlignedExample extends Component {
+  render() {
+    return (
+      <div>
+        <Image shape='rounded' />
+        <Image shape='circular' />
+      </div>
+    )
+  }
+}
diff --git a/docs/app/Examples/elements/Image/Types/ImageAvatarExample.js b/docs/app/Examples/elements/Image/Types/ImageAvatarExample.js
new file mode 100644
index 0000000000..e2cafb9c4e
--- /dev/null
+++ b/docs/app/Examples/elements/Image/Types/ImageAvatarExample.js
@@ -0,0 +1,10 @@
+import React, { Component } from 'react'
+import { Image } from 'stardust'
+
+export default class ImageAvatarExample extends Component {
+  render() {
+    return (
+      <Image avatar />
+    )
+  }
+}
diff --git a/docs/app/Examples/elements/Image/Types/ImageBorderedExample.js b/docs/app/Examples/elements/Image/Types/ImageBorderedExample.js
new file mode 100644
index 0000000000..9f238f5ee6
--- /dev/null
+++ b/docs/app/Examples/elements/Image/Types/ImageBorderedExample.js
@@ -0,0 +1,10 @@
+import React, { Component } from 'react'
+import { Image } from 'stardust'
+
+export default class ImageBorderedExample extends Component {
+  render() {
+    return (
+      <Image bordered />
+    )
+  }
+}
diff --git a/docs/app/Examples/elements/Image/Types/ImageCenteredExample.js b/docs/app/Examples/elements/Image/Types/ImageCenteredExample.js
new file mode 100644
index 0000000000..49f1e01dce
--- /dev/null
+++ b/docs/app/Examples/elements/Image/Types/ImageCenteredExample.js
@@ -0,0 +1,10 @@
+import React, { Component } from 'react'
+import { Image } from 'stardust'
+
+export default class ImageCenteredExample extends Component {
+  render() {
+    return (
+      <Image centered />
+    )
+  }
+}
diff --git a/docs/app/Examples/elements/Image/Types/ImageDisabledExample.js b/docs/app/Examples/elements/Image/Types/ImageDisabledExample.js
new file mode 100644
index 0000000000..07f5ecb1ed
--- /dev/null
+++ b/docs/app/Examples/elements/Image/Types/ImageDisabledExample.js
@@ -0,0 +1,10 @@
+import React, { Component } from 'react'
+import { Image } from 'stardust'
+
+export default class ImageDisabledExample extends Component {
+  render() {
+    return (
+      <Image disabled />
+    )
+  }
+}
diff --git a/docs/app/Examples/elements/Image/Types/ImageFloatedExample.js b/docs/app/Examples/elements/Image/Types/ImageFloatedExample.js
new file mode 100644
index 0000000000..8d245d2f3e
--- /dev/null
+++ b/docs/app/Examples/elements/Image/Types/ImageFloatedExample.js
@@ -0,0 +1,10 @@
+import React, { Component } from 'react'
+import { Image } from 'stardust'
+
+export default class ImageSpacedExample extends Component {
+  render() {
+    return (
+      <Image floated='left' />
+    )
+  }
+}
diff --git a/docs/app/Examples/elements/Image/Types/ImageFluidExample.js b/docs/app/Examples/elements/Image/Types/ImageFluidExample.js
new file mode 100644
index 0000000000..ca895fc543
--- /dev/null
+++ b/docs/app/Examples/elements/Image/Types/ImageFluidExample.js
@@ -0,0 +1,10 @@
+import React, { Component } from 'react'
+import { Image } from 'stardust'
+
+export default class ImageFluidExample extends Component {
+  render() {
+    return (
+      <Image fluid />
+    )
+  }
+}
diff --git a/docs/app/Examples/elements/Image/Types/ImageHiddenExample.js b/docs/app/Examples/elements/Image/Types/ImageHiddenExample.js
new file mode 100644
index 0000000000..f3960c1dec
--- /dev/null
+++ b/docs/app/Examples/elements/Image/Types/ImageHiddenExample.js
@@ -0,0 +1,10 @@
+import React, { Component } from 'react'
+import { Image } from 'stardust'
+
+export default class ImageHiddenExample extends Component {
+  render() {
+    return (
+      <Image hidden />
+    )
+  }
+}
diff --git a/docs/app/Examples/elements/Image/Types/ImageLinkExample.js b/docs/app/Examples/elements/Image/Types/ImageLinkExample.js
index 0815704f69..f558d6295c 100644
--- a/docs/app/Examples/elements/Image/Types/ImageLinkExample.js
+++ b/docs/app/Examples/elements/Image/Types/ImageLinkExample.js
@@ -1,11 +1,10 @@
 import React, { Component } from 'react'
 import { Image } from 'stardust'
-import image from '../image-text.png'
 
 export default class ImageLinkExample extends Component {
   render() {
     return (
-      <Image src={image} href='http://google.com' size='medium' />
+      <Image link />
     )
   }
 }
diff --git a/docs/app/Examples/elements/Image/Types/ImageShapesExample.js b/docs/app/Examples/elements/Image/Types/ImageShapesExample.js
new file mode 100644
index 0000000000..6ba0da50a3
--- /dev/null
+++ b/docs/app/Examples/elements/Image/Types/ImageShapesExample.js
@@ -0,0 +1,13 @@
+import React, { Component } from 'react'
+import { Image } from 'stardust'
+
+export default class ImageShapesExample extends Component {
+  render() {
+    return (
+      <div>
+        <Image shape='rounded' />
+        <Image shape='circular' />
+      </div>
+    )
+  }
+}
diff --git a/docs/app/Examples/elements/Image/Types/ImageSizeExample.js b/docs/app/Examples/elements/Image/Types/ImageSizeExample.js
new file mode 100644
index 0000000000..a999787f3b
--- /dev/null
+++ b/docs/app/Examples/elements/Image/Types/ImageSizeExample.js
@@ -0,0 +1,19 @@
+import React, { Component } from 'react'
+import { Image } from 'stardust'
+
+export default class ImageSizeExample extends Component {
+  render() {
+    return (
+      <div>
+        <Image size='mini' />
+        <Image size='tiny' />
+        <Image size='small' />
+        <Image size='medium' />
+        <Image size='large' />
+        <Image size='big' />
+        <Image size='huge' />
+        <Image size='massive' />
+      </div>
+    )
+  }
+}
diff --git a/docs/app/Examples/elements/Image/Types/ImageSpacedExample.js b/docs/app/Examples/elements/Image/Types/ImageSpacedExample.js
new file mode 100644
index 0000000000..7e6efc4693
--- /dev/null
+++ b/docs/app/Examples/elements/Image/Types/ImageSpacedExample.js
@@ -0,0 +1,10 @@
+import React, { Component } from 'react'
+import { Image } from 'stardust'
+
+export default class ImageSpacedExample extends Component {
+  render() {
+    return (
+      <Image spaced />
+    )
+  }
+}
diff --git a/docs/app/Examples/elements/Image/Types/ImageTypesExamples.js b/docs/app/Examples/elements/Image/Types/ImageTypesExamples.js
index fb509abf2a..79af60b0ca 100644
--- a/docs/app/Examples/elements/Image/Types/ImageTypesExamples.js
+++ b/docs/app/Examples/elements/Image/Types/ImageTypesExamples.js
@@ -1,28 +1,71 @@
-/* eslint-disable max-len */
-
 import React, { Component } from 'react'
 import ComponentExample from 'docs/app/Components/ComponentDoc/ComponentExample'
 import ExampleSection from 'docs/app/Components/ComponentDoc/ExampleSection'
-import { Message } from 'stardust'
 
 export default class ImageTypesExamples extends Component {
   render() {
     return (
       <ExampleSection title='Types'>
         <ComponentExample
-          title='Image'
-          description='An image'
-          examplePath='elements/Image/Types/ImageImageExample'
-        >
-          <Message className='info'>
-            Unless a size is specified, images will use the original dimensions of the image up to the size of its container..
-          </Message>
-        </ComponentExample>
-        <ComponentExample
-          title='Image Link'
-          description='An image can be formatted to link to other content'
+          title='Aligned'
+          description='A standard image'
+          examplePath='elements/Image/Types/ImageAlignedExample'
+        />
+        <ComponentExample
+          title='Avatar'
+          description='A standard image'
+          examplePath='elements/Image/Types/ImageAvatarExample'
+        />
+        <ComponentExample
+          title='Bordered'
+          description='A standard image'
+          examplePath='elements/Image/Types/ImageBorderedExample'
+        />
+        <ComponentExample
+          title='Centered'
+          description='A standard image'
+          examplePath='elements/Image/Types/ImageCenteredExample'
+        />
+        <ComponentExample
+          title='Disabled'
+          description='A standard image'
+          examplePath='elements/Image/Types/ImageDisabledExample'
+        />
+        <ComponentExample
+          title='Floated'
+          description='A standard image'
+          examplePath='elements/Image/Types/ImageFloatedExample'
+        />
+        <ComponentExample
+          title='Fluid'
+          description='A standard image'
+          examplePath='elements/Image/Types/ImageFluidExample'
+        />
+        <ComponentExample
+          title='Hidden'
+          description='A standard image'
+          examplePath='elements/Image/Types/ImageHiddenExample'
+        />
+        <ComponentExample
+          title='Link'
+          description='A standard image'
           examplePath='elements/Image/Types/ImageLinkExample'
         />
+        <ComponentExample
+          title='Shapes'
+          description='A standard image'
+          examplePath='elements/Image/Types/ImageShapesExample'
+        />
+        <ComponentExample
+          title='Size'
+          description='A standard image'
+          examplePath='elements/Image/Types/ImageSizeExample'
+        />
+        <ComponentExample
+          title='Spaced'
+          description='A standard image'
+          examplePath='elements/Image/Types/ImageSpacedExample'
+        />
       </ExampleSection>
     )
   }