diff --git a/dev/dartdoc.dart b/dev/dartdoc.dart
index 2d31151379..db59ba3627 100755
--- a/dev/dartdoc.dart
+++ b/dev/dartdoc.dart
@@ -41,13 +41,15 @@ dependencies:
   if (code != 0)
     exit(code);
 
-  // Generate the documentation; we require dartdoc >= 0.9.3+1.
+  // Generate the documentation; we require dartdoc >= 0.9.4.
   List<String> args = <String>[
     'global', 'run', 'dartdoc',
     '--header', 'styles.html',
     '--header', 'analytics.html',
     '--dart-sdk', '../../bin/cache/dart-sdk',
-    '--exclude', 'temp_doc'
+    '--exclude', 'temp_doc',
+    '--favicon=favicon.ico',
+    '--use-categories'
   ];
   for (String libraryRef in _libraryRefs()) {
     String name = _entityName(libraryRef);
diff --git a/dev/docs/favicon.ico b/dev/docs/favicon.ico
new file mode 100644
index 0000000000..71344eea5b
Binary files /dev/null and b/dev/docs/favicon.ico differ
diff --git a/dev/docs/styles.html b/dev/docs/styles.html
index e3dc2b3016..40a1890e7b 100644
--- a/dev/docs/styles.html
+++ b/dev/docs/styles.html
@@ -9,6 +9,7 @@
     line-height: 1.5;
     color: #111;
     background-color: #fdfdfd;
+    font-weight: 300;
   }
 
   h1, h2, h3, h4, h5, h6 {
@@ -18,11 +19,25 @@
   h1 {
     font-size: 42px !important;
     letter-spacing: -1px;
-    line-height: 1.1;
+  }
+
+  header h1 {
+    font-weight: 300;
   }
 
   h2 {
+    color: #111;
+    font-size: 26px;
+  }
+
+  .markdown h2 {
+    font-size: 24px;
+  }
+
+  section.summary h2 {
     font-size: 32px;
+    color: inherit;
+    border-bottom: none;
   }
 
   .sidebar ol,
@@ -30,8 +45,59 @@
     font-size: inherit;
   }
 
+  .sidebar-offcanvas-left ol {
+    padding: 0 16px 16px 0;
+  }
+
+  .sidebar h5 {
+    padding-top: 0 !important;
+    text-transform: uppercase;
+  }
+
+  .sidebar-offcanvas-left {
+    background-color: inherit;
+  }
+
+  .sidebar-offcanvas-left h5 {
+    border-bottom: none;
+    padding: 0 0 16px 0;
+  }
+
+  .sidebar-offcanvas-left h5:last-of-type {
+    padding: 0 0 16px 0;
+  }
+
+  pre,
+  pre.prettyprint,
   pre > code {
-    font-size: 14px;
+    font-size: 15px;
+  }
+
+  pre,
+  pre.prettyprint {
+    background: inherit;
+    border: none;
+    margin: 0 0 15px 0;
+    padding: 8px 12px;
+  }
+
+  code {
+    background-color: inherit;
+  }
+
+  dl.dl-horizontal dt {
+    color: inherit;
+  }
+
+  footer {
+    border-top: 1px solid #e8e8e8;
+    height: inherit;
+    padding-bottom: 15px;
+    text-transform: lowercase;
+  }
+
+  footer p {
+    color: #828282;
   }
 </style>
 
diff --git a/packages/flutter/lib/animation.dart b/packages/flutter/lib/animation.dart
index ad8efec305..eb86a879b2 100644
--- a/packages/flutter/lib/animation.dart
+++ b/packages/flutter/lib/animation.dart
@@ -4,7 +4,7 @@
 
 /// The Flutter animation system.
 ///
-/// See <https://flutter.io/animations/> for an overview.
+/// See [flutter.io/animations](https://flutter.io/animations/) for an overview.
 ///
 /// This library depends only on core Dart libraries and the `newton` package.
 library animation;
diff --git a/packages/flutter/lib/material.dart b/packages/flutter/lib/material.dart
index cd1f593336..d158559e24 100644
--- a/packages/flutter/lib/material.dart
+++ b/packages/flutter/lib/material.dart
@@ -4,7 +4,9 @@
 
 /// Flutter widgets implementing Material Design.
 ///
-/// See https://www.google.com/design/spec/material-design/introduction.html
+/// See
+/// [www.google.com/design/spec/material-design](https://www.google.com/design/spec/material-design/introduction.html)
+/// for an introduction to Material Design.
 library material;
 
 export 'src/material/app.dart';
diff --git a/packages/flutter/lib/src/material/icon.dart b/packages/flutter/lib/src/material/icon.dart
index 3679f8b1f5..7f18d42a70 100644
--- a/packages/flutter/lib/src/material/icon.dart
+++ b/packages/flutter/lib/src/material/icon.dart
@@ -6,6 +6,7 @@ import 'package:flutter/widgets.dart';
 
 import 'colors.dart';
 import 'icons.dart';
+import 'icon_button.dart';
 import 'icon_theme.dart';
 import 'theme.dart';
 
diff --git a/packages/flutter/lib/src/material/icons.dart b/packages/flutter/lib/src/material/icons.dart
index ed6ab2a0e3..4c09a62a6b 100644
--- a/packages/flutter/lib/src/material/icons.dart
+++ b/packages/flutter/lib/src/material/icons.dart
@@ -38,7 +38,7 @@ class IconData {
 ///
 ///  * [Icon]
 ///  * [IconButton]
-///  * <https://design.google.com/icons/>
+///  * [design.google.com/icons](https://design.google.com/icons/)
 class Icons {
   Icons._();
 
diff --git a/packages/flutter_test/lib/flutter_test.dart b/packages/flutter_test/lib/flutter_test.dart
index 27db964486..ae88fd54b0 100644
--- a/packages/flutter_test/lib/flutter_test.dart
+++ b/packages/flutter_test/lib/flutter_test.dart
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-/// Testing library for flutter, built on top of package:test.
+/// Testing library for flutter, built on top of `package:test`.
 library flutter_test;
 
 export 'src/instrumentation.dart';