diff --git a/Examples/UIExplorer/ImageExample.js b/Examples/UIExplorer/ImageExample.js
index 60fc38dab..eb13b16b0 100644
--- a/Examples/UIExplorer/ImageExample.js
+++ b/Examples/UIExplorer/ImageExample.js
@@ -148,15 +148,15 @@ exports.examples = [
},
{
title: 'Plain Static Image',
- description: 'Static assets should be required by prefixing with `image!` ' +
- 'and are located in the app bundle.',
+ description: 'Static assets should be placed in the source code tree, and ' +
+ 'required in the same way as JavaScript modules.',
render: function() {
return (
-
-
-
-
+
+
+
+
);
},
@@ -320,19 +320,19 @@ exports.examples = [
diff --git a/Examples/UIExplorer/MapViewExample.js b/Examples/UIExplorer/MapViewExample.js
index bd1173a83..b10620b04 100644
--- a/Examples/UIExplorer/MapViewExample.js
+++ b/Examples/UIExplorer/MapViewExample.js
@@ -313,7 +313,7 @@ exports.examples = [
}}>
),
diff --git a/Examples/UIExplorer/UIExplorer/Images.xcassets/uie_comment_highlighted.imageset/Contents.json b/Examples/UIExplorer/UIExplorer/Images.xcassets/uie_comment_highlighted.imageset/Contents.json
deleted file mode 100644
index e1ccff627..000000000
--- a/Examples/UIExplorer/UIExplorer/Images.xcassets/uie_comment_highlighted.imageset/Contents.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
- "images" : [
- {
- "idiom" : "universal",
- "scale" : "1x"
- },
- {
- "idiom" : "universal",
- "scale" : "2x",
- "filename" : "uie_comment_highlighted@2x.png"
- },
- {
- "idiom" : "universal",
- "scale" : "3x"
- }
- ],
- "info" : {
- "version" : 1,
- "author" : "xcode"
- }
-}
\ No newline at end of file
diff --git a/Examples/UIExplorer/UIExplorer/Images.xcassets/uie_comment_normal.imageset/Contents.json b/Examples/UIExplorer/UIExplorer/Images.xcassets/uie_comment_normal.imageset/Contents.json
deleted file mode 100644
index 6f75231d5..000000000
--- a/Examples/UIExplorer/UIExplorer/Images.xcassets/uie_comment_normal.imageset/Contents.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
- "images" : [
- {
- "idiom" : "universal",
- "scale" : "1x"
- },
- {
- "idiom" : "universal",
- "scale" : "2x",
- "filename" : "uie_comment_normal@2x.png"
- },
- {
- "idiom" : "universal",
- "scale" : "3x"
- }
- ],
- "info" : {
- "version" : 1,
- "author" : "xcode"
- }
-}
\ No newline at end of file
diff --git a/Examples/UIExplorer/UIExplorer/Images.xcassets/uie_thumb_normal.imageset/Contents.json b/Examples/UIExplorer/UIExplorer/Images.xcassets/uie_thumb_normal.imageset/Contents.json
deleted file mode 100644
index 06a7acabf..000000000
--- a/Examples/UIExplorer/UIExplorer/Images.xcassets/uie_thumb_normal.imageset/Contents.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
- "images" : [
- {
- "idiom" : "universal",
- "scale" : "1x"
- },
- {
- "idiom" : "universal",
- "scale" : "2x",
- "filename" : "uie_thumb_normal@2x.png"
- },
- {
- "idiom" : "universal",
- "scale" : "3x"
- }
- ],
- "info" : {
- "version" : 1,
- "author" : "xcode"
- }
-}
\ No newline at end of file
diff --git a/Examples/UIExplorer/UIExplorer/Images.xcassets/uie_thumb_selected.imageset/Contents.json b/Examples/UIExplorer/UIExplorer/Images.xcassets/uie_thumb_selected.imageset/Contents.json
deleted file mode 100644
index a00a3dc54..000000000
--- a/Examples/UIExplorer/UIExplorer/Images.xcassets/uie_thumb_selected.imageset/Contents.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
- "images" : [
- {
- "idiom" : "universal",
- "scale" : "1x"
- },
- {
- "idiom" : "universal",
- "scale" : "2x",
- "filename" : "uie_thumb_selected@2x.png"
- },
- {
- "idiom" : "universal",
- "scale" : "3x"
- }
- ],
- "info" : {
- "version" : 1,
- "author" : "xcode"
- }
-}
\ No newline at end of file
diff --git a/Examples/UIExplorer/android/app/src/main/res/drawable/uie_comment_highlighted.png b/Examples/UIExplorer/android/app/src/main/res/drawable/uie_comment_highlighted.png
deleted file mode 100644
index b33726757..000000000
Binary files a/Examples/UIExplorer/android/app/src/main/res/drawable/uie_comment_highlighted.png and /dev/null differ
diff --git a/Examples/UIExplorer/android/app/src/main/res/drawable/uie_comment_normal.png b/Examples/UIExplorer/android/app/src/main/res/drawable/uie_comment_normal.png
deleted file mode 100644
index 6491689fb..000000000
Binary files a/Examples/UIExplorer/android/app/src/main/res/drawable/uie_comment_normal.png and /dev/null differ
diff --git a/Examples/UIExplorer/android/app/src/main/res/drawable/uie_thumb_normal.png b/Examples/UIExplorer/android/app/src/main/res/drawable/uie_thumb_normal.png
deleted file mode 100644
index 72683dfac..000000000
Binary files a/Examples/UIExplorer/android/app/src/main/res/drawable/uie_thumb_normal.png and /dev/null differ
diff --git a/Examples/UIExplorer/android/app/src/main/res/drawable/uie_thumb_selected.png b/Examples/UIExplorer/android/app/src/main/res/drawable/uie_thumb_selected.png
deleted file mode 100644
index 79eb69cf9..000000000
Binary files a/Examples/UIExplorer/android/app/src/main/res/drawable/uie_thumb_selected.png and /dev/null differ
diff --git a/Examples/UIExplorer/UIExplorer/Images.xcassets/uie_comment_highlighted.imageset/uie_comment_highlighted@2x.png b/Examples/UIExplorer/uie_comment_highlighted@2x.png
similarity index 100%
rename from Examples/UIExplorer/UIExplorer/Images.xcassets/uie_comment_highlighted.imageset/uie_comment_highlighted@2x.png
rename to Examples/UIExplorer/uie_comment_highlighted@2x.png
diff --git a/Examples/UIExplorer/UIExplorer/Images.xcassets/uie_comment_normal.imageset/uie_comment_normal@2x.png b/Examples/UIExplorer/uie_comment_normal@2x.png
similarity index 100%
rename from Examples/UIExplorer/UIExplorer/Images.xcassets/uie_comment_normal.imageset/uie_comment_normal@2x.png
rename to Examples/UIExplorer/uie_comment_normal@2x.png
diff --git a/Examples/UIExplorer/UIExplorer/Images.xcassets/uie_thumb_normal.imageset/uie_thumb_normal@2x.png b/Examples/UIExplorer/uie_thumb_normal@2x.png
similarity index 100%
rename from Examples/UIExplorer/UIExplorer/Images.xcassets/uie_thumb_normal.imageset/uie_thumb_normal@2x.png
rename to Examples/UIExplorer/uie_thumb_normal@2x.png
diff --git a/Examples/UIExplorer/UIExplorer/Images.xcassets/uie_thumb_selected.imageset/uie_thumb_selected@2x.png b/Examples/UIExplorer/uie_thumb_selected@2x.png
similarity index 100%
rename from Examples/UIExplorer/UIExplorer/Images.xcassets/uie_thumb_selected.imageset/uie_thumb_selected@2x.png
rename to Examples/UIExplorer/uie_thumb_selected@2x.png
diff --git a/Libraries/Image/Image.android.js b/Libraries/Image/Image.android.js
index 3cf5ae1f6..4c920dcf2 100644
--- a/Libraries/Image/Image.android.js
+++ b/Libraries/Image/Image.android.js
@@ -38,7 +38,7 @@ var resolveAssetSource = require('resolveAssetSource');
*
*
*