diff --git a/app/src/main/java/org/isoron/uhabits/widgets/BaseWidgetProvider.java b/app/src/main/java/org/isoron/uhabits/widgets/BaseWidgetProvider.java
index cb6097c01..d430db009 100644
--- a/app/src/main/java/org/isoron/uhabits/widgets/BaseWidgetProvider.java
+++ b/app/src/main/java/org/isoron/uhabits/widgets/BaseWidgetProvider.java
@@ -33,6 +33,7 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.RemoteViews;
+import android.widget.TextView;
 
 import org.isoron.uhabits.R;
 import org.isoron.uhabits.helpers.UIHelper;
@@ -123,23 +124,27 @@ public abstract class BaseWidgetProvider extends AppWidgetProvider
 
     protected abstract void refreshCustomViewData(View widgetView);
 
-    private void savePreview(Context context, int widgetId, Bitmap widgetCache)
+    private void savePreview(Context context, int widgetId, Bitmap widgetCache, int width,
+                             int height, String label)
     {
         try
         {
             LayoutInflater inflater = LayoutInflater.from(context);
             View view = inflater.inflate(getLayoutId(), null);
 
+            TextView tvLabel = (TextView) view.findViewById(R.id.label);
+            if(tvLabel != null) tvLabel.setText(label);
+
             ImageView iv = (ImageView) view.findViewById(R.id.imageView);
-            iv.setImageBitmap(widgetCache);
+            if(iv != null) iv.setImageBitmap(widgetCache);
 
-            view.measure(portraitWidth, portraitHeight);
+            view.measure(width, height);
             view.layout(0, 0, view.getMeasuredWidth(), view.getMeasuredHeight());
             view.setDrawingCacheEnabled(true);
             view.buildDrawingCache();
             Bitmap previewCache = view.getDrawingCache();
 
-            String filename = String.format("%s/%d.png", context.getExternalCacheDir(), widgetId);
+            String filename = String.format("%s/%d_%d.png", context.getExternalCacheDir(), widgetId, width);
             Log.d("BaseWidgetProvider", String.format("Writing %s", filename));
             FileOutputStream out = new FileOutputStream(filename);
 
@@ -285,7 +290,7 @@ public abstract class BaseWidgetProvider extends AppWidgetProvider
                 remoteViews.setViewPadding(R.id.buttonOverlay, p[0], p[1], p[2], p[3]);
             }
 
-            //savePreview(context, widgetId, drawingCache);
+            //savePreview(context, widgetId, drawingCache, width, height, habit.name);
 
             PendingIntent onClickIntent = getOnClickPendingIntent(context, habit);
             if (onClickIntent != null) remoteViews.setOnClickPendingIntent(R.id.button,
diff --git a/app/src/main/res/drawable-nodpi/widget_preview_checkmark.png b/app/src/main/res/drawable-nodpi/widget_preview_checkmark.png
new file mode 100644
index 000000000..0cbac62e6
Binary files /dev/null and b/app/src/main/res/drawable-nodpi/widget_preview_checkmark.png differ
diff --git a/app/src/main/res/drawable-nodpi/widget_preview_frequency.png b/app/src/main/res/drawable-nodpi/widget_preview_frequency.png
new file mode 100644
index 000000000..561afb45c
Binary files /dev/null and b/app/src/main/res/drawable-nodpi/widget_preview_frequency.png differ
diff --git a/app/src/main/res/drawable-nodpi/widget_preview_history.png b/app/src/main/res/drawable-nodpi/widget_preview_history.png
new file mode 100644
index 000000000..95297b6ee
Binary files /dev/null and b/app/src/main/res/drawable-nodpi/widget_preview_history.png differ
diff --git a/app/src/main/res/drawable-nodpi/widget_preview_score.png b/app/src/main/res/drawable-nodpi/widget_preview_score.png
new file mode 100644
index 000000000..8d9b3baa5
Binary files /dev/null and b/app/src/main/res/drawable-nodpi/widget_preview_score.png differ
diff --git a/app/src/main/res/drawable-nodpi/widget_preview_streaks.png b/app/src/main/res/drawable-nodpi/widget_preview_streaks.png
new file mode 100644
index 000000000..b1fe031e6
Binary files /dev/null and b/app/src/main/res/drawable-nodpi/widget_preview_streaks.png differ
diff --git a/app/src/main/res/drawable/widget_preview_checkmark.png b/app/src/main/res/drawable/widget_preview_checkmark.png
deleted file mode 100644
index ceb7d6541..000000000
Binary files a/app/src/main/res/drawable/widget_preview_checkmark.png and /dev/null differ
diff --git a/app/src/main/res/drawable/widget_preview_frequency.png b/app/src/main/res/drawable/widget_preview_frequency.png
deleted file mode 100644
index a3fc86505..000000000
Binary files a/app/src/main/res/drawable/widget_preview_frequency.png and /dev/null differ
diff --git a/app/src/main/res/drawable/widget_preview_history.png b/app/src/main/res/drawable/widget_preview_history.png
deleted file mode 100644
index bcc829bbc..000000000
Binary files a/app/src/main/res/drawable/widget_preview_history.png and /dev/null differ
diff --git a/app/src/main/res/drawable/widget_preview_score.png b/app/src/main/res/drawable/widget_preview_score.png
deleted file mode 100644
index 101569dbc..000000000
Binary files a/app/src/main/res/drawable/widget_preview_score.png and /dev/null differ
diff --git a/app/src/main/res/drawable/widget_preview_streaks.png b/app/src/main/res/drawable/widget_preview_streaks.png
deleted file mode 100644
index b7771c2b8..000000000
Binary files a/app/src/main/res/drawable/widget_preview_streaks.png and /dev/null differ