diff --git a/docs/src/ComponentsPage.js b/docs/src/ComponentsPage.js
index b3f8e8355b..faeeff0b7b 100644
--- a/docs/src/ComponentsPage.js
+++ b/docs/src/ComponentsPage.js
@@ -675,6 +675,22 @@ const ComponentsPage = React.createClass({
                   <PropTable component="Col"/>
                 </div>
 
+                {/* Images */}
+                <div className="bs-docs-section">
+                  <h1 className="page-header"><Anchor id="images">Images</Anchor></h1>
+
+                  <h3><Anchor id="image-shape">Shape</Anchor></h3>
+                  <p>Use the <code>rounded</code>, <code>circle</code> and <code>thumbnail</code> props to customise the image.</p>
+                  <ReactPlayground codeText={Samples.ImageShape} />
+
+                  <h3><Anchor id="image-responsive">Responsive</Anchor></h3>
+                  <p>Use the <code>responsive</code> to scale image nicely to the parent element.</p>
+                  <ReactPlayground codeText={Samples.ImageResponsive} />
+
+                  <h3><Anchor id="image-props">Props</Anchor></h3>
+                  <PropTable component="Image"/>
+                </div>
+
                 {/* Thumbnail */}
                 <div className="bs-docs-section">
                   <h1 className="page-header"><Anchor id="thumbnail">Thumbnail</Anchor></h1>
@@ -904,22 +920,6 @@ const ComponentsPage = React.createClass({
                   <h4><Anchor id="utilities-fade-props">Props</Anchor></h4>
                   <PropTable component="Fade"/>
                 </div>
-
-                {/* Images */}
-                <div className="bs-docs-section">
-                  <h1 className="page-header"><Anchor id="images">Images</Anchor></h1>
-
-                  <h3><Anchor id="image-shape">Shape</Anchor></h3>
-                  <p>Use the <code>rounded</code>, <code>circle</code> and <code>thumbnail</code> props to customise the image.</p>
-                  <ReactPlayground codeText={Samples.ImageShape} />
-
-                  <h3><Anchor id="image-responsive">Responsive</Anchor></h3>
-                  <p>Use the <code>responsive</code> to scale image nicely to the parent element.</p>
-                  <ReactPlayground codeText={Samples.ImageResponsive} />
-
-                  <h3><Anchor id="image-props">Props</Anchor></h3>
-                  <PropTable component="Image"/>
-                </div>
               </div>
 
 
@@ -953,6 +953,7 @@ const ComponentsPage = React.createClass({
                     <NavItem href="#alerts" key={14}>Alerts</NavItem>
                     <NavItem href="#carousels" key={15}>Carousels</NavItem>
                     <NavItem href="#grids" key={16}>Grids</NavItem>
+                    <NavItem href="#images" key={29}>Images</NavItem>
                     <NavItem href="#thumbnail" key={17}>Thumbnail</NavItem>
                     <NavItem href="#listgroup" key={18}>List group</NavItem>
                     <NavItem href="#labels" key={19}>Labels</NavItem>
@@ -964,7 +965,6 @@ const ComponentsPage = React.createClass({
                     <NavItem href="#tables" key={25}>Tables</NavItem>
                     <NavItem href="#input" key={26}>Input</NavItem>
                     <NavItem href="#utilities" key={28}>Utilities</NavItem>
-                    <NavItem href="#images" key={29}>Images</NavItem>
                   </Nav>
                   <a className="back-to-top" href="#top">
                   Back to top
diff --git a/test/ImageSpec.js b/test/ImageSpec.js
index 6597a45ac3..a694f887c2 100644
--- a/test/ImageSpec.js
+++ b/test/ImageSpec.js
@@ -2,9 +2,9 @@ import React from 'react';
 import ReactTestUtils from 'react/lib/ReactTestUtils';
 import Image from '../src/Image';
 
-describe('Image', function() {
+describe('Image', () => {
 
-  it('should be an image', function() {
+  it('should be an image', () => {
     let instance = ReactTestUtils.renderIntoDocument(
       <Image />
     );
@@ -13,7 +13,7 @@ describe('Image', function() {
     image.nodeName.should.equal('IMG');
   });
 
-  it('should provide src and alt prop', function() {
+  it('should provide src and alt prop', () => {
     let instance = ReactTestUtils.renderIntoDocument(
       <Image src="image.jpg" alt="this is alt" />
     );
@@ -23,7 +23,7 @@ describe('Image', function() {
     assert.equal(image.getAttribute('alt'), 'this is alt');
   });
 
-  it('should have correct class when responsive prop is set', function() {
+  it('should have correct class when responsive prop is set', () => {
     let instance = ReactTestUtils.renderIntoDocument(
       <Image responsive />
     );
@@ -32,7 +32,7 @@ describe('Image', function() {
     imageClassName.should.match(/\bimg-responsive\b/);
   });
 
-  it('should have correct class when rounded prop is set', function() {
+  it('should have correct class when rounded prop is set', () => {
     let instance = ReactTestUtils.renderIntoDocument(
       <Image rounded />
     );
@@ -41,7 +41,7 @@ describe('Image', function() {
     imageClassName.should.match(/\bimg-rounded\b/);
   });
 
-  it('should have correct class when circle prop is set', function() {
+  it('should have correct class when circle prop is set', () => {
     let instance = ReactTestUtils.renderIntoDocument(
       <Image circle />
     );
@@ -50,7 +50,7 @@ describe('Image', function() {
     imageClassName.should.match(/\bimg-circle\b/);
   });
 
-  it('should have correct class when thumbnail prop is set', function() {
+  it('should have correct class when thumbnail prop is set', () => {
     let instance = ReactTestUtils.renderIntoDocument(
       <Image thumbnail />
     );