diff --git a/examples/flutter_gallery/lib/demo/material/cards_demo.dart b/examples/flutter_gallery/lib/demo/material/cards_demo.dart
index 4beaacb..876ee60 100644
--- a/examples/flutter_gallery/lib/demo/material/cards_demo.dart
+++ b/examples/flutter_gallery/lib/demo/material/cards_demo.dart
@@ -5,10 +5,18 @@
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 
+const String _kGalleryAssetsPackage = 'flutter_gallery_assets';
+
 class TravelDestination {
-  const TravelDestination({ this.assetName, this.title, this.description });
+  const TravelDestination({
+    this.assetName,
+    this.assetPackage,
+    this.title,
+    this.description,
+  });
 
   final String assetName;
+  final String assetPackage;
   final String title;
   final List<String> description;
 
@@ -17,7 +25,8 @@
 
 final List<TravelDestination> destinations = <TravelDestination>[
   const TravelDestination(
-    assetName: 'packages/flutter_gallery_assets/top_10_australian_beaches.jpg',
+    assetName: 'top_10_australian_beaches.jpg',
+    assetPackage: _kGalleryAssetsPackage,
     title: 'Top 10 Australian beaches',
     description: const <String>[
       'Number 10',
@@ -26,7 +35,8 @@
     ],
   ),
   const TravelDestination(
-    assetName: 'packages/flutter_gallery_assets/kangaroo_valley_safari.jpg',
+    assetName: 'kangaroo_valley_safari.jpg',
+    assetPackage: _kGalleryAssetsPackage,
     title: 'Kangaroo Valley Safari',
     description: const <String>[
       '2031 Moss Vale Road',
@@ -65,6 +75,7 @@
                   new Positioned.fill(
                     child: new Image.asset(
                       destination.assetName,
+                      package: destination.assetPackage,
                       fit: BoxFit.cover,
                     ),
                   ),
diff --git a/examples/flutter_gallery/lib/demo/material/drawer_demo.dart b/examples/flutter_gallery/lib/demo/material/drawer_demo.dart
index 5840de3..b382394 100644
--- a/examples/flutter_gallery/lib/demo/material/drawer_demo.dart
+++ b/examples/flutter_gallery/lib/demo/material/drawer_demo.dart
@@ -4,9 +4,10 @@
 
 import 'package:flutter/material.dart';
 
-const String _kAsset0 = 'packages/flutter_gallery_assets/shrine/vendors/zach.jpg';
-const String _kAsset1 = 'packages/flutter_gallery_assets/shrine/vendors/16c477b.jpg';
-const String _kAsset2 = 'packages/flutter_gallery_assets/shrine/vendors/sandra-adams.jpg';
+const String _kAsset0 = 'shrine/vendors/zach.jpg';
+const String _kAsset1 = 'shrine/vendors/16c477b.jpg';
+const String _kAsset2 = 'shrine/vendors/sandra-adams.jpg';
+const String _kGalleryAssetsPackage = 'flutter_gallery_assets';
 
 class DrawerDemo extends StatefulWidget {
   static const String routeName = '/material/drawer';
@@ -93,10 +94,25 @@
             new UserAccountsDrawerHeader(
               accountName: const Text('Zach Widget'),
               accountEmail: const Text('zach.widget@example.com'),
-              currentAccountPicture: const CircleAvatar(backgroundImage: const AssetImage(_kAsset0)),
+              currentAccountPicture: const CircleAvatar(
+                backgroundImage: const AssetImage(
+                  _kAsset0,
+                  package: _kGalleryAssetsPackage,
+                ),
+              ),
               otherAccountsPictures: const <Widget>[
-                const CircleAvatar(backgroundImage: const AssetImage(_kAsset1)),
-                const CircleAvatar(backgroundImage: const AssetImage(_kAsset2)),
+                const CircleAvatar(
+                  backgroundImage: const AssetImage(
+                    _kAsset1,
+                    package: _kGalleryAssetsPackage,
+                  ),
+                ),
+                const CircleAvatar(
+                  backgroundImage: const AssetImage(
+                    _kAsset2,
+                    package: _kGalleryAssetsPackage,
+                  ),
+                ),
               ],
               onDetailsPressed: () {
                 _showDrawerContents = !_showDrawerContents;
@@ -167,7 +183,10 @@
                 decoration: const BoxDecoration(
                   shape: BoxShape.circle,
                   image: const DecorationImage(
-                    image: const AssetImage(_kAsset0),
+                    image: const AssetImage(
+                      _kAsset0,
+                      package: _kGalleryAssetsPackage,
+                    ),
                   ),
                 ),
               ),
diff --git a/examples/flutter_gallery/lib/demo/material/grid_list_demo.dart b/examples/flutter_gallery/lib/demo/material/grid_list_demo.dart
index fe06de7..ef14888 100644
--- a/examples/flutter_gallery/lib/demo/material/grid_list_demo.dart
+++ b/examples/flutter_gallery/lib/demo/material/grid_list_demo.dart
@@ -14,11 +14,19 @@
 typedef void BannerTapCallback(Photo photo);
 
 const double _kMinFlingVelocity = 800.0;
+const String _kGalleryAssetsPackage = 'flutter_gallery_assets';
 
 class Photo {
-  Photo({ this.assetName, this.title, this.caption, this.isFavorite: false });
+  Photo({
+    this.assetName,
+    this.assetPackage,
+    this.title,
+    this.caption,
+    this.isFavorite: false,
+  });
 
   final String assetName;
+  final String assetPackage;
   final String title;
   final String caption;
 
@@ -130,7 +138,11 @@
           transform: new Matrix4.identity()
             ..translate(_offset.dx, _offset.dy)
             ..scale(_scale),
-          child: new Image.asset(widget.photo.assetName, fit: BoxFit.cover),
+          child: new Image.asset(
+            widget.photo.assetName,
+            package: widget.photo.assetPackage,
+            fit: BoxFit.cover,
+          ),
         ),
       ),
     );
@@ -177,7 +189,11 @@
       child: new Hero(
         key: new Key(photo.assetName),
         tag: photo.tag,
-        child: new Image.asset(photo.assetName, fit: BoxFit.cover)
+        child: new Image.asset(
+          photo.assetName,
+          package: photo.assetPackage,
+          fit: BoxFit.cover,
+        )
       )
     );
 
@@ -239,62 +255,74 @@
 
   List<Photo> photos = <Photo>[
     new Photo(
-      assetName: 'packages/flutter_gallery_assets/landscape_0.jpg',
+      assetName: 'landscape_0.jpg',
+      assetPackage: _kGalleryAssetsPackage,
       title: 'Philippines',
       caption: 'Batad rice terraces',
     ),
     new Photo(
-      assetName: 'packages/flutter_gallery_assets/landscape_1.jpg',
+      assetName: 'landscape_1.jpg',
+      assetPackage: _kGalleryAssetsPackage,
       title: 'Italy',
       caption: 'Ceresole Reale',
     ),
     new Photo(
-      assetName: 'packages/flutter_gallery_assets/landscape_2.jpg',
+      assetName: 'landscape_2.jpg',
+      assetPackage: _kGalleryAssetsPackage,
       title: 'Somewhere',
       caption: 'Beautiful mountains',
     ),
     new Photo(
-      assetName: 'packages/flutter_gallery_assets/landscape_3.jpg',
+      assetName: 'landscape_3.jpg',
+      assetPackage: _kGalleryAssetsPackage,
       title: 'A place',
       caption: 'Beautiful hills',
     ),
     new Photo(
-      assetName: 'packages/flutter_gallery_assets/landscape_4.jpg',
+      assetName: 'landscape_4.jpg',
+      assetPackage: _kGalleryAssetsPackage,
       title: 'New Zealand',
       caption: 'View from the van',
     ),
     new Photo(
-      assetName: 'packages/flutter_gallery_assets/landscape_5.jpg',
+      assetName: 'landscape_5.jpg',
+      assetPackage: _kGalleryAssetsPackage,
       title: 'Autumn',
       caption: 'The golden season',
     ),
     new Photo(
-      assetName: 'packages/flutter_gallery_assets/landscape_6.jpg',
+      assetName: 'landscape_6.jpg',
+      assetPackage: _kGalleryAssetsPackage,
       title: 'Germany',
       caption: 'Englischer Garten',
     ),
     new Photo(
-      assetName: 'packages/flutter_gallery_assets/landscape_7.jpg',
+      assetName: 'landscape_7.jpg',
+      assetPackage: _kGalleryAssetsPackage,
       title: 'A country',
       caption: 'Grass fields',
     ),
     new Photo(
-      assetName: 'packages/flutter_gallery_assets/landscape_8.jpg',
+      assetName: 'landscape_8.jpg',
+      assetPackage: _kGalleryAssetsPackage,
       title: 'Mountain country',
       caption: 'River forest',
     ),
     new Photo(
-      assetName: 'packages/flutter_gallery_assets/landscape_9.jpg',
+      assetName: 'landscape_9.jpg',
+      assetPackage: _kGalleryAssetsPackage,
       title: 'Alpine place',
       caption: 'Green hills',
     ),
     new Photo(
-      assetName: 'packages/flutter_gallery_assets/landscape_10.jpg',
+      assetName: 'landscape_10.jpg',
+      assetPackage: _kGalleryAssetsPackage,
       title: 'Desert land',
       caption: 'Blue skies',
     ),
     new Photo(
-      assetName: 'packages/flutter_gallery_assets/landscape_11.jpg',
+      assetName: 'landscape_11.jpg',
+      assetPackage: _kGalleryAssetsPackage,
       title: 'Narnia',
       caption: 'Rocks and rivers',
     ),
diff --git a/examples/flutter_gallery/lib/demo/material/tabs_demo.dart b/examples/flutter_gallery/lib/demo/material/tabs_demo.dart
index 11bd79d..43798e3 100644
--- a/examples/flutter_gallery/lib/demo/material/tabs_demo.dart
+++ b/examples/flutter_gallery/lib/demo/material/tabs_demo.dart
@@ -7,6 +7,8 @@
 // Each TabBarView contains a _Page and for each _Page there is a list
 // of _CardData objects. Each _CardData object is displayed by a _CardItem.
 
+const String _kGalleryAssetsPackage = 'flutter_gallery_assets';
+
 class _Page {
   _Page({ this.label });
   final String label;
@@ -14,62 +16,75 @@
 }
 
 class _CardData {
-  const _CardData({ this.title, this.imageAsset });
+  const _CardData({ this.title, this.imageAsset, this.imageAssetPackage });
   final String title;
   final String imageAsset;
+  final String imageAssetPackage;
 }
 
 final Map<_Page, List<_CardData>> _allPages = <_Page, List<_CardData>>{
   new _Page(label: 'LEFT'): <_CardData>[
     const _CardData(
       title: 'Vintage Bluetooth Radio',
-      imageAsset: 'packages/flutter_gallery_assets/shrine/products/radio.png',
+      imageAsset: 'shrine/products/radio.png',
+      imageAssetPackage: _kGalleryAssetsPackage,
     ),
     const _CardData(
       title: 'Sunglasses',
-      imageAsset: 'packages/flutter_gallery_assets/shrine/products/sunnies.png',
+      imageAsset: 'shrine/products/sunnies.png',
+      imageAssetPackage: _kGalleryAssetsPackage,
     ),
     const _CardData(
       title: 'Clock',
-      imageAsset: 'packages/flutter_gallery_assets/shrine/products/clock.png',
+      imageAsset: 'shrine/products/clock.png',
+      imageAssetPackage: _kGalleryAssetsPackage,
     ),
     const _CardData(
       title: 'Red popsicle',
-      imageAsset: 'packages/flutter_gallery_assets/shrine/products/popsicle.png',
+      imageAsset: 'shrine/products/popsicle.png',
+      imageAssetPackage: _kGalleryAssetsPackage,
     ),
     const _CardData(
       title: 'Folding Chair',
-      imageAsset: 'packages/flutter_gallery_assets/shrine/products/lawn_chair.png',
+      imageAsset: 'shrine/products/lawn_chair.png',
+      imageAssetPackage: _kGalleryAssetsPackage,
     ),
     const _CardData(
       title: 'Green comfort chair',
-      imageAsset: 'packages/flutter_gallery_assets/shrine/products/chair.png',
+      imageAsset: 'shrine/products/chair.png',
+      imageAssetPackage: _kGalleryAssetsPackage,
     ),
     const _CardData(
       title: 'Old Binoculars',
-      imageAsset: 'packages/flutter_gallery_assets/shrine/products/binoculars.png',
+      imageAsset: 'shrine/products/binoculars.png',
+      imageAssetPackage: _kGalleryAssetsPackage,
     ),
     const _CardData(
       title: 'Teapot',
-      imageAsset: 'packages/flutter_gallery_assets/shrine/products/teapot.png',
+      imageAsset: 'shrine/products/teapot.png',
+      imageAssetPackage: _kGalleryAssetsPackage,
     ),
     const _CardData(
       title: 'Blue suede shoes',
-      imageAsset: 'packages/flutter_gallery_assets/shrine/products/chucks.png',
+      imageAsset: 'shrine/products/chucks.png',
+      imageAssetPackage: _kGalleryAssetsPackage,
     ),
     const _CardData(
       title: 'Dipped Brush',
-      imageAsset: 'packages/flutter_gallery_assets/shrine/products/brush.png',
+      imageAsset: 'shrine/products/brush.png',
+      imageAssetPackage: _kGalleryAssetsPackage,
     ),
     const _CardData(
       title: 'Perfect Goldfish Bowl',
-      imageAsset: 'packages/flutter_gallery_assets/shrine/products/fish_bowl.png',
+      imageAsset: 'shrine/products/fish_bowl.png',
+      imageAssetPackage: _kGalleryAssetsPackage,
     ),
   ],
   new _Page(label: 'RIGHT'): <_CardData>[
     const _CardData(
       title: 'Beachball',
-      imageAsset: 'packages/flutter_gallery_assets/shrine/products/beachball.png',
+      imageAsset: 'shrine/products/beachball.png',
+      imageAssetPackage: _kGalleryAssetsPackage,
     ),
   ],
 };
@@ -99,7 +114,11 @@
             new SizedBox(
               width: 144.0,
               height: 144.0,
-              child: new Image.asset(data.imageAsset, fit: BoxFit.contain),
+              child: new Image.asset(
+                data.imageAsset,
+                package: data.imageAssetPackage,
+                fit: BoxFit.contain,
+              ),
             ),
             new Center(
               child: new Text(data.title, style: Theme.of(context).textTheme.title),
