diff --git a/res/drawable/flavor_image_border.xml b/res/drawable/flavor_image_border.xml
new file mode 100644
index 00000000..3dea012b
--- /dev/null
+++ b/res/drawable/flavor_image_border.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/res/layout/headlines_row.xml b/res/layout/headlines_row.xml
index 1d40e1bf..8902a6bc 100644
--- a/res/layout/headlines_row.xml
+++ b/res/layout/headlines_row.xml
@@ -85,8 +85,12 @@
android:id="@+id/flavor_image"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:layout_gravity="center"
android:adjustViewBounds="true"
- android:maxHeight="128dp"
+ android:background="@drawable/flavor_image_border"
+ android:cropToPadding="true"
+ android:maxHeight="256dp"
+ android:padding="1dp"
android:scaleType="centerInside"
android:src="@null"
android:visibility="gone" />
diff --git a/res/layout/headlines_row_selected.xml b/res/layout/headlines_row_selected.xml
index 332b239a..0e600daa 100644
--- a/res/layout/headlines_row_selected.xml
+++ b/res/layout/headlines_row_selected.xml
@@ -79,12 +79,16 @@
android:layout_gravity="center"
android:layout_height="wrap_content" >
-
diff --git a/res/layout/headlines_row_selected_unread.xml b/res/layout/headlines_row_selected_unread.xml
index 553bb9f8..5e4f7eeb 100644
--- a/res/layout/headlines_row_selected_unread.xml
+++ b/res/layout/headlines_row_selected_unread.xml
@@ -84,8 +84,12 @@
android:id="@+id/flavor_image"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:layout_gravity="center"
android:adjustViewBounds="true"
- android:maxHeight="128dp"
+ android:background="@drawable/flavor_image_border"
+ android:cropToPadding="true"
+ android:maxHeight="256dp"
+ android:padding="1dp"
android:scaleType="centerInside"
android:src="@null"
android:visibility="gone" />
diff --git a/res/layout/headlines_row_unread.xml b/res/layout/headlines_row_unread.xml
index 70fc7a9e..96a65134 100644
--- a/res/layout/headlines_row_unread.xml
+++ b/res/layout/headlines_row_unread.xml
@@ -74,18 +74,21 @@
+ android:layout_height="wrap_content"
+ android:paddingTop="3dp" >
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 69ffbd8c..d5653d49 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -221,5 +221,6 @@
Use condensed fonts for headline titles and a few other UI elements.
Show full article content in headlines. Resource intensive, can cause UI lag on some devices.
Show full content
+ Show article image
diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index bd45d553..3a2166b9 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -92,6 +92,11 @@
android:key="headlines_show_content"
android:summary="@string/pref_headlines_show_content_long"
android:title="@string/pref_headlines_show_content" />
+
+