diff --git a/doc/ext/LICENSE.txt b/doc/ext/LICENSE.txt
index 3ebab893..589b78dc 100644
--- a/doc/ext/LICENSE.txt
+++ b/doc/ext/LICENSE.txt
@@ -15,7 +15,7 @@ The file
 
 - plot_directive.py
 
-was derived from code in Matplotlib (http://matplotlib.sf.net/), which has the
+was derived from code in Matplotlib (http://matplotlib.org), which has the
 following license:
 
 Copyright (c) 2002-2008 John D. Hunter; All Rights Reserved.
diff --git a/doc/source/_static/GitHub-Mark-32px.png b/doc/source/_static/GitHub-Mark-32px.png
new file mode 100644
index 00000000..176ab33e
Binary files /dev/null and b/doc/source/_static/GitHub-Mark-32px.png differ
diff --git a/doc/source/_templates/navbar.html b/doc/source/_templates/navbar.html
index 267af8e7..427d19ff 100644
--- a/doc/source/_templates/navbar.html
+++ b/doc/source/_templates/navbar.html
@@ -2,4 +2,9 @@
 <li><a href="/download.html">Download</a></li>
 <li><a href="/docs/dev/auto_examples">Gallery</a></li>
 <li><a href="/docs/dev">Documentation</a></li>
-<li><a href="https://github.com/scikit-image/scikit-image">Source</a></li>
+<li><a href="https://github.com/scikit-image/scikit-image">
+    <img src="_static/GitHub-Mark-32px.png" style="height: 15px; width: 15px;
+                                                   display: inline; float: none;
+                                                   padding-bottom: 3px;">
+    Source</a>
+</li>
diff --git a/doc/source/gitwash/known_projects.inc b/doc/source/gitwash/known_projects.inc
index 29723528..c4c3c42f 100644
--- a/doc/source/gitwash/known_projects.inc
+++ b/doc/source/gitwash/known_projects.inc
@@ -6,7 +6,7 @@
 .. _`PROJECTNAME mailing list`: http://projects.scipy.org/mailman/listinfo/nipy-devel
 
 .. numpy
-.. _numpy: hhttp://numpy.scipy.org
+.. _numpy: http://numpy.org
 .. _`numpy github`: http://github.com/numpy/numpy
 .. _`numpy mailing list`: http://mail.scipy.org/mailman/listinfo/numpy-discussion
 
diff --git a/doc/source/install.txt b/doc/source/install.txt
index 81cb7340..18c0fdda 100644
--- a/doc/source/install.txt
+++ b/doc/source/install.txt
@@ -2,7 +2,7 @@ Pre-built installation
 ----------------------
 
 `Windows binaries
-<http://www.lfd.uci.edu/~gohlke/pythonlibs/#scikits.image>`__
+<http://www.lfd.uci.edu/~gohlke/pythonlibs/#scikit-image>`__
 are kindly provided by Christoph Gohlke.
 
 The latest stable release is also included as part of