diff --git a/samples/WeatherListWidget/AndroidManifest.xml b/samples/WeatherListWidget/AndroidManifest.xml
index cfb23722c..7b1638f9c 100644
--- a/samples/WeatherListWidget/AndroidManifest.xml
+++ b/samples/WeatherListWidget/AndroidManifest.xml
@@ -21,7 +21,9 @@
      to come from a domain that you own or have control over. -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.example.android.weatherlistwidget">
-    <uses-sdk android:minSdkVersion="11" />
+
+    <uses-sdk android:minSdkVersion="11"
+              android:targetSdkVersion="14"/>
     <application android:label="Weather Widget Sample">
         <!-- The widget provider -->
         <receiver android:name="WeatherWidgetProvider">
@@ -42,4 +44,4 @@
         <provider android:name="WeatherDataProvider"
               android:authorities="com.example.android.weatherlistwidget.provider" />
     </application>
-</manifest>
\ No newline at end of file
+</manifest>
diff --git a/samples/WeatherListWidget/res/drawable-hdpi/body.png b/samples/WeatherListWidget/res/drawable-hdpi/body.png
index 0a2c1d130..17d303f9c 100644
Binary files a/samples/WeatherListWidget/res/drawable-hdpi/body.png and b/samples/WeatherListWidget/res/drawable-hdpi/body.png differ
diff --git a/samples/WeatherListWidget/res/drawable-hdpi/footer.png b/samples/WeatherListWidget/res/drawable-hdpi/footer.png
index 73cc95c26..43962f7e2 100644
Binary files a/samples/WeatherListWidget/res/drawable-hdpi/footer.png and b/samples/WeatherListWidget/res/drawable-hdpi/footer.png differ
diff --git a/samples/WeatherListWidget/res/drawable-hdpi/header.9.png b/samples/WeatherListWidget/res/drawable-hdpi/header.9.png
new file mode 100644
index 000000000..5f347687d
Binary files /dev/null and b/samples/WeatherListWidget/res/drawable-hdpi/header.9.png differ
diff --git a/samples/WeatherListWidget/res/drawable-hdpi/header.png b/samples/WeatherListWidget/res/drawable-hdpi/header.png
deleted file mode 100644
index e659aee23..000000000
Binary files a/samples/WeatherListWidget/res/drawable-hdpi/header.png and /dev/null differ
diff --git a/samples/WeatherListWidget/res/drawable-hdpi/item_bg_dark.png b/samples/WeatherListWidget/res/drawable-hdpi/item_bg_dark.png
index 5097ab70c..f5886bdc3 100644
Binary files a/samples/WeatherListWidget/res/drawable-hdpi/item_bg_dark.png and b/samples/WeatherListWidget/res/drawable-hdpi/item_bg_dark.png differ
diff --git a/samples/WeatherListWidget/res/drawable-hdpi/item_bg_light.png b/samples/WeatherListWidget/res/drawable-hdpi/item_bg_light.png
index 019f36ce0..e8b5aafe6 100644
Binary files a/samples/WeatherListWidget/res/drawable-hdpi/item_bg_light.png and b/samples/WeatherListWidget/res/drawable-hdpi/item_bg_light.png differ
diff --git a/samples/WeatherListWidget/res/drawable-hdpi/refresh.png b/samples/WeatherListWidget/res/drawable-hdpi/refresh.png
index 284777318..eaec9cb64 100644
Binary files a/samples/WeatherListWidget/res/drawable-hdpi/refresh.png and b/samples/WeatherListWidget/res/drawable-hdpi/refresh.png differ
diff --git a/samples/WeatherListWidget/res/drawable-hdpi/refresh_pressed.png b/samples/WeatherListWidget/res/drawable-hdpi/refresh_pressed.png
index 820cc3606..34438b77b 100644
Binary files a/samples/WeatherListWidget/res/drawable-hdpi/refresh_pressed.png and b/samples/WeatherListWidget/res/drawable-hdpi/refresh_pressed.png differ
diff --git a/samples/WeatherListWidget/res/drawable-ldpi/body.png b/samples/WeatherListWidget/res/drawable-ldpi/body.png
deleted file mode 100644
index 3ce427611..000000000
Binary files a/samples/WeatherListWidget/res/drawable-ldpi/body.png and /dev/null differ
diff --git a/samples/WeatherListWidget/res/drawable-ldpi/footer.png b/samples/WeatherListWidget/res/drawable-ldpi/footer.png
deleted file mode 100644
index ab89bf3de..000000000
Binary files a/samples/WeatherListWidget/res/drawable-ldpi/footer.png and /dev/null differ
diff --git a/samples/WeatherListWidget/res/drawable-ldpi/header.png b/samples/WeatherListWidget/res/drawable-ldpi/header.png
deleted file mode 100644
index ff29577d6..000000000
Binary files a/samples/WeatherListWidget/res/drawable-ldpi/header.png and /dev/null differ
diff --git a/samples/WeatherListWidget/res/drawable-ldpi/icon.png b/samples/WeatherListWidget/res/drawable-ldpi/icon.png
deleted file mode 100644
index 1095584ec..000000000
Binary files a/samples/WeatherListWidget/res/drawable-ldpi/icon.png and /dev/null differ
diff --git a/samples/WeatherListWidget/res/drawable-ldpi/item_bg_dark.png b/samples/WeatherListWidget/res/drawable-ldpi/item_bg_dark.png
deleted file mode 100644
index c945b5f94..000000000
Binary files a/samples/WeatherListWidget/res/drawable-ldpi/item_bg_dark.png and /dev/null differ
diff --git a/samples/WeatherListWidget/res/drawable-ldpi/item_bg_light.png b/samples/WeatherListWidget/res/drawable-ldpi/item_bg_light.png
deleted file mode 100644
index a14b9a649..000000000
Binary files a/samples/WeatherListWidget/res/drawable-ldpi/item_bg_light.png and /dev/null differ
diff --git a/samples/WeatherListWidget/res/drawable-ldpi/refresh.png b/samples/WeatherListWidget/res/drawable-ldpi/refresh.png
deleted file mode 100644
index d08343c07..000000000
Binary files a/samples/WeatherListWidget/res/drawable-ldpi/refresh.png and /dev/null differ
diff --git a/samples/WeatherListWidget/res/drawable-ldpi/refresh_pressed.png b/samples/WeatherListWidget/res/drawable-ldpi/refresh_pressed.png
deleted file mode 100644
index 3da3ae6b3..000000000
Binary files a/samples/WeatherListWidget/res/drawable-ldpi/refresh_pressed.png and /dev/null differ
diff --git a/samples/WeatherListWidget/res/drawable-mdpi/body.png b/samples/WeatherListWidget/res/drawable-mdpi/body.png
index 5331a9a3c..a08d03ba8 100644
Binary files a/samples/WeatherListWidget/res/drawable-mdpi/body.png and b/samples/WeatherListWidget/res/drawable-mdpi/body.png differ
diff --git a/samples/WeatherListWidget/res/drawable-mdpi/footer.png b/samples/WeatherListWidget/res/drawable-mdpi/footer.png
index ca8b7ec93..d3960a796 100644
Binary files a/samples/WeatherListWidget/res/drawable-mdpi/footer.png and b/samples/WeatherListWidget/res/drawable-mdpi/footer.png differ
diff --git a/samples/WeatherListWidget/res/drawable-mdpi/header.9.png b/samples/WeatherListWidget/res/drawable-mdpi/header.9.png
new file mode 100644
index 000000000..2372225e3
Binary files /dev/null and b/samples/WeatherListWidget/res/drawable-mdpi/header.9.png differ
diff --git a/samples/WeatherListWidget/res/drawable-mdpi/header.png b/samples/WeatherListWidget/res/drawable-mdpi/header.png
deleted file mode 100644
index 5452abf8e..000000000
Binary files a/samples/WeatherListWidget/res/drawable-mdpi/header.png and /dev/null differ
diff --git a/samples/WeatherListWidget/res/drawable-mdpi/item_bg_dark.png b/samples/WeatherListWidget/res/drawable-mdpi/item_bg_dark.png
index 5ae548042..a3ac9d7e3 100644
Binary files a/samples/WeatherListWidget/res/drawable-mdpi/item_bg_dark.png and b/samples/WeatherListWidget/res/drawable-mdpi/item_bg_dark.png differ
diff --git a/samples/WeatherListWidget/res/drawable-mdpi/item_bg_light.png b/samples/WeatherListWidget/res/drawable-mdpi/item_bg_light.png
index 569694435..ec6f5aa24 100644
Binary files a/samples/WeatherListWidget/res/drawable-mdpi/item_bg_light.png and b/samples/WeatherListWidget/res/drawable-mdpi/item_bg_light.png differ
diff --git a/samples/WeatherListWidget/res/drawable-mdpi/refresh.png b/samples/WeatherListWidget/res/drawable-mdpi/refresh.png
index 569b36012..006bcc5fb 100644
Binary files a/samples/WeatherListWidget/res/drawable-mdpi/refresh.png and b/samples/WeatherListWidget/res/drawable-mdpi/refresh.png differ
diff --git a/samples/WeatherListWidget/res/drawable-mdpi/refresh_pressed.png b/samples/WeatherListWidget/res/drawable-mdpi/refresh_pressed.png
index 5f1066267..d8ca9b5e8 100644
Binary files a/samples/WeatherListWidget/res/drawable-mdpi/refresh_pressed.png and b/samples/WeatherListWidget/res/drawable-mdpi/refresh_pressed.png differ
diff --git a/samples/WeatherListWidget/res/layout/widget_layout.xml b/samples/WeatherListWidget/res/layout/widget_layout.xml
index 4b09efcdf..4c58fa754 100644
--- a/samples/WeatherListWidget/res/layout/widget_layout.xml
+++ b/samples/WeatherListWidget/res/layout/widget_layout.xml
@@ -14,9 +14,15 @@
      limitations under the License.
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="294dp"
+    android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical">
+    android:orientation="vertical"
+    android:layout_marginTop="@dimen/widget_margin_top"
+    android:layout_marginBottom="@dimen/widget_margin_bottom"
+    android:layout_marginLeft="@dimen/widget_margin_left"
+    android:layout_marginRight="@dimen/widget_margin_right">
+    <!-- We define separate margins to allow for flexibility in twiddling the margins
+         depending on device form factor and target SDK version. -->
     <FrameLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
@@ -24,12 +30,14 @@
             android:id="@+id/header"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:scaleType="fitXY"
             android:src="@drawable/header" />
         <ImageButton
             android:id="@+id/refresh"
             android:layout_width="56dp"
             android:layout_height="39dp"
-            android:layout_marginLeft="222dp"
+            android:layout_gravity="right|top"
+            android:layout_marginRight="15dp"
             android:layout_marginTop="20dp"
             android:background="@drawable/refresh_button" />
     </FrameLayout>
@@ -57,5 +65,6 @@
         android:id="@+id/footer"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:scaleType="fitXY"
         android:src="@drawable/footer" />
 </LinearLayout>
diff --git a/samples/WeatherListWidget/res/values-v14/dimens.xml b/samples/WeatherListWidget/res/values-v14/dimens.xml
new file mode 100644
index 000000000..8b5494e64
--- /dev/null
+++ b/samples/WeatherListWidget/res/values-v14/dimens.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources>
+    <dimen name="widget_margin_top">0dp</dimen>
+    <dimen name="widget_margin_bottom">0dp</dimen>
+    <dimen name="widget_margin_left">0dp</dimen>
+    <dimen name="widget_margin_right">0dp</dimen>
+</resources>
diff --git a/samples/WeatherListWidget/res/values/dimens.xml b/samples/WeatherListWidget/res/values/dimens.xml
new file mode 100644
index 000000000..00257a9a1
--- /dev/null
+++ b/samples/WeatherListWidget/res/values/dimens.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources>
+    <dimen name="widget_margin_top">8dp</dimen>
+    <dimen name="widget_margin_bottom">8dp</dimen>
+    <dimen name="widget_margin_left">8dp</dimen>
+    <dimen name="widget_margin_right">8dp</dimen>
+</resources>
\ No newline at end of file
diff --git a/samples/WeatherListWidget/res/xml/widgetinfo.xml b/samples/WeatherListWidget/res/xml/widgetinfo.xml
index af641063e..e6e9cf3a0 100644
--- a/samples/WeatherListWidget/res/xml/widgetinfo.xml
+++ b/samples/WeatherListWidget/res/xml/widgetinfo.xml
@@ -15,10 +15,12 @@
 -->
 <appwidget-provider
   xmlns:android="http://schemas.android.com/apk/res/android"
-  android:minWidth="222dip"
-  android:minHeight="222dip"
+  android:minWidth="250dp"
+  android:minHeight="180dp"
   android:updatePeriodMillis="1800000"
   android:initialLayout="@layout/widget_layout"
   android:resizeMode="vertical"
+  android:minResizeWidth="250dp"
+  android:minResizeHeight="110dp"
   android:previewImage="@drawable/preview">
 </appwidget-provider>
diff --git a/samples/WeatherListWidget/src/com/example/android/weatherlistwidget/WeatherWidgetService.java b/samples/WeatherListWidget/src/com/example/android/weatherlistwidget/WeatherWidgetService.java
index e0bc68276..1d3c34970 100644
--- a/samples/WeatherListWidget/src/com/example/android/weatherlistwidget/WeatherWidgetService.java
+++ b/samples/WeatherListWidget/src/com/example/android/weatherlistwidget/WeatherWidgetService.java
@@ -123,4 +123,4 @@ class StackRemoteViewsFactory implements RemoteViewsService.RemoteViewsFactory {
         mCursor = mContext.getContentResolver().query(WeatherDataProvider.CONTENT_URI, null, null,
                 null, null);
     }
-}
\ No newline at end of file
+}