diff --git a/briar-android/src/net/sf/briar/android/blogs/BlogAdapter.java b/briar-android/src/net/sf/briar/android/blogs/BlogAdapter.java
index 3141bf4af60736195bb56b8138a06182a09ddd69..046b10650b9836f4e557cf0e3ce7bfbacb87bbcf 100644
--- a/briar-android/src/net/sf/briar/android/blogs/BlogAdapter.java
+++ b/briar-android/src/net/sf/briar/android/blogs/BlogAdapter.java
@@ -54,6 +54,7 @@ class BlogAdapter extends ArrayAdapter<GroupMessageHeader> {
 		authorLayout.setGravity(CENTER_VERTICAL);
 
 		ImageView thumb = new ImageView(ctx);
+		thumb.setPadding(5, 5, 5, 5);
 		Rating rating = item.getRating();
 		if(rating == GOOD) thumb.setImageResource(R.drawable.rating_good);
 		else if(rating == BAD) thumb.setImageResource(R.drawable.rating_bad);
@@ -65,7 +66,7 @@ class BlogAdapter extends ArrayAdapter<GroupMessageHeader> {
 		name.setLayoutParams(WRAP_WRAP_1);
 		name.setTextSize(18);
 		name.setMaxLines(1);
-		name.setPadding(10, 10, 10, 10);
+		name.setPadding(0, 10, 10, 10);
 		Author author = item.getAuthor();
 		if(author == null) {
 			name.setTextColor(res.getColor(R.color.anonymous_author));
@@ -89,6 +90,7 @@ class BlogAdapter extends ArrayAdapter<GroupMessageHeader> {
 			LinearLayout attachmentLayout = new LinearLayout(ctx);
 			attachmentLayout.setOrientation(HORIZONTAL);
 			ImageView attachment = new ImageView(ctx);
+			attachment.setPadding(5, 0, 5, 5);
 			attachment.setImageResource(R.drawable.content_attachment);
 			attachmentLayout.addView(attachment);
 			attachmentLayout.addView(new HorizontalSpace(ctx));
diff --git a/briar-android/src/net/sf/briar/android/blogs/BlogListAdapter.java b/briar-android/src/net/sf/briar/android/blogs/BlogListAdapter.java
index 7d177e9813da5dc6239db993525ace194dd90bc3..2ec0fec77511101249f34d8fbbbdf8b6bc8781e5 100644
--- a/briar-android/src/net/sf/briar/android/blogs/BlogListAdapter.java
+++ b/briar-android/src/net/sf/briar/android/blogs/BlogListAdapter.java
@@ -78,6 +78,7 @@ implements OnItemClickListener {
 				LinearLayout attachmentLayout = new LinearLayout(ctx);
 				attachmentLayout.setOrientation(HORIZONTAL);
 				ImageView attachment = new ImageView(ctx);
+				attachment.setPadding(5, 0, 5, 5);
 				attachment.setImageResource(R.drawable.content_attachment);
 				attachmentLayout.addView(attachment);
 				attachmentLayout.addView(new HorizontalSpace(ctx));
diff --git a/briar-android/src/net/sf/briar/android/blogs/ReadBlogPostActivity.java b/briar-android/src/net/sf/briar/android/blogs/ReadBlogPostActivity.java
index 07c24e7454828a51eeaf0e3cd2b271270652cf7c..f27e0ae4a363250f4de343a17f232f468162b0dc 100644
--- a/briar-android/src/net/sf/briar/android/blogs/ReadBlogPostActivity.java
+++ b/briar-android/src/net/sf/briar/android/blogs/ReadBlogPostActivity.java
@@ -123,6 +123,7 @@ implements OnClickListener {
 		header.setGravity(CENTER_VERTICAL);
 
 		thumb = new ImageView(this);
+		thumb.setPadding(5, 5, 5, 5);
 		if(rating == GOOD) thumb.setImageResource(R.drawable.rating_good);
 		else if(rating == BAD) thumb.setImageResource(R.drawable.rating_bad);
 		else thumb.setImageResource(R.drawable.rating_unrated);
@@ -133,7 +134,7 @@ implements OnClickListener {
 		name.setLayoutParams(WRAP_WRAP_1);
 		name.setTextSize(18);
 		name.setMaxLines(1);
-		name.setPadding(10, 10, 10, 10);
+		name.setPadding(0, 10, 10, 10);
 		if(authorName == null) {
 			name.setTextColor(res.getColor(R.color.anonymous_author));
 			name.setText(R.string.anonymous);
diff --git a/briar-android/src/net/sf/briar/android/contact/ContactListAdapter.java b/briar-android/src/net/sf/briar/android/contact/ContactListAdapter.java
index 52763e97cbd21aa4cbd3d32b9753c978b7a35955..577e569d2052b04dc33287568628e0aa29f2ca66 100644
--- a/briar-android/src/net/sf/briar/android/contact/ContactListAdapter.java
+++ b/briar-android/src/net/sf/briar/android/contact/ContactListAdapter.java
@@ -37,6 +37,7 @@ implements OnItemClickListener {
 		layout.setGravity(CENTER_VERTICAL);
 
 		ImageView bulb = new ImageView(ctx);
+		bulb.setPadding(5, 5, 5, 5);
 		if(item.isConnected())
 			bulb.setImageResource(R.drawable.contact_connected);
 		else bulb.setImageResource(R.drawable.contact_disconnected);
@@ -47,7 +48,7 @@ implements OnItemClickListener {
 		name.setLayoutParams(WRAP_WRAP_1);
 		name.setTextSize(18);
 		name.setMaxLines(1);
-		name.setPadding(10, 10, 10, 10);
+		name.setPadding(0, 10, 10, 10);
 		name.setText(item.getContactName());
 		layout.addView(name);
 
diff --git a/briar-android/src/net/sf/briar/android/groups/GroupAdapter.java b/briar-android/src/net/sf/briar/android/groups/GroupAdapter.java
index bf3ca47397f25eac0f2244584d328a47eb7a0146..d47cc864c339dc1bec6938ca4c95e13f41116dfd 100644
--- a/briar-android/src/net/sf/briar/android/groups/GroupAdapter.java
+++ b/briar-android/src/net/sf/briar/android/groups/GroupAdapter.java
@@ -54,6 +54,7 @@ class GroupAdapter extends ArrayAdapter<GroupMessageHeader> {
 		authorLayout.setGravity(CENTER_VERTICAL);
 
 		ImageView thumb = new ImageView(ctx);
+		thumb.setPadding(5, 5, 5, 5);
 		Rating rating = item.getRating();
 		if(rating == GOOD) thumb.setImageResource(R.drawable.rating_good);
 		else if(rating == BAD) thumb.setImageResource(R.drawable.rating_bad);
@@ -65,7 +66,7 @@ class GroupAdapter extends ArrayAdapter<GroupMessageHeader> {
 		name.setLayoutParams(WRAP_WRAP_1);
 		name.setTextSize(18);
 		name.setMaxLines(1);
-		name.setPadding(10, 10, 10, 10);
+		name.setPadding(0, 10, 10, 10);
 		Author author = item.getAuthor();
 		if(author == null) {
 			name.setTextColor(res.getColor(R.color.anonymous_author));
@@ -89,6 +90,7 @@ class GroupAdapter extends ArrayAdapter<GroupMessageHeader> {
 			LinearLayout attachmentLayout = new LinearLayout(ctx);
 			attachmentLayout.setOrientation(HORIZONTAL);
 			ImageView attachment = new ImageView(ctx);
+			attachment.setPadding(5, 0, 5, 5);
 			attachment.setImageResource(R.drawable.content_attachment);
 			attachmentLayout.addView(attachment);
 			attachmentLayout.addView(new HorizontalSpace(ctx));
diff --git a/briar-android/src/net/sf/briar/android/groups/GroupListAdapter.java b/briar-android/src/net/sf/briar/android/groups/GroupListAdapter.java
index 56b9ef3691642d6a8b2adda729e43b03dbd76bc9..455941cdbff0d5859e912b55b6e68236b9970bc0 100644
--- a/briar-android/src/net/sf/briar/android/groups/GroupListAdapter.java
+++ b/briar-android/src/net/sf/briar/android/groups/GroupListAdapter.java
@@ -78,6 +78,7 @@ implements OnItemClickListener {
 				LinearLayout attachmentLayout = new LinearLayout(ctx);
 				attachmentLayout.setOrientation(HORIZONTAL);
 				ImageView attachment = new ImageView(ctx);
+				attachment.setPadding(5, 0, 5, 5);
 				attachment.setImageResource(R.drawable.content_attachment);
 				attachmentLayout.addView(attachment);
 				attachmentLayout.addView(new HorizontalSpace(ctx));
diff --git a/briar-android/src/net/sf/briar/android/groups/ReadGroupPostActivity.java b/briar-android/src/net/sf/briar/android/groups/ReadGroupPostActivity.java
index 42c45bbe5238b7ab22b3d7ab703241fbff3cac12..bc5a33a3d7b4ff3fb741bea4384221eac5129d86 100644
--- a/briar-android/src/net/sf/briar/android/groups/ReadGroupPostActivity.java
+++ b/briar-android/src/net/sf/briar/android/groups/ReadGroupPostActivity.java
@@ -130,6 +130,7 @@ implements OnClickListener {
 		header.setGravity(CENTER_VERTICAL);
 
 		thumb = new ImageView(this);
+		thumb.setPadding(5, 5, 5, 5);
 		if(rating == GOOD) thumb.setImageResource(R.drawable.rating_good);
 		else if(rating == BAD) thumb.setImageResource(R.drawable.rating_bad);
 		else thumb.setImageResource(R.drawable.rating_unrated);
@@ -140,7 +141,7 @@ implements OnClickListener {
 		name.setLayoutParams(WRAP_WRAP_1);
 		name.setTextSize(18);
 		name.setMaxLines(1);
-		name.setPadding(10, 10, 10, 10);
+		name.setPadding(0, 10, 10, 10);
 		if(authorName == null) {
 			name.setTextColor(res.getColor(R.color.anonymous_author));
 			name.setText(R.string.anonymous);
diff --git a/briar-android/src/net/sf/briar/android/invitation/BluetoothWidget.java b/briar-android/src/net/sf/briar/android/invitation/BluetoothWidget.java
index 0b72d687158534c09951286b9bb90a59b63e200b..93b86f88cb25bf3aaaceffc1869ddd064ab94470 100644
--- a/briar-android/src/net/sf/briar/android/invitation/BluetoothWidget.java
+++ b/briar-android/src/net/sf/briar/android/invitation/BluetoothWidget.java
@@ -41,6 +41,7 @@ public class BluetoothWidget extends LinearLayout implements OnClickListener {
 		if(adapter == null) {
 			listener.bluetoothStateChanged(false);
 			ImageView warning = new ImageView(ctx);
+			warning.setPadding(5, 5, 5, 5);
 			warning.setImageResource(R.drawable.alerts_and_states_warning);
 			addView(warning);
 			status.setText(R.string.bluetooth_not_available);
@@ -48,6 +49,7 @@ public class BluetoothWidget extends LinearLayout implements OnClickListener {
 		} else if(adapter.getScanMode() == SCAN_MODE_CONNECTABLE_DISCOVERABLE) {
 			listener.bluetoothStateChanged(true);
 			ImageView ok = new ImageView(ctx);
+			ok.setPadding(5, 5, 5, 5);
 			ok.setImageResource(R.drawable.navigation_accept);
 			addView(ok);
 			status.setText(R.string.bluetooth_enabled);
@@ -59,6 +61,7 @@ public class BluetoothWidget extends LinearLayout implements OnClickListener {
 		} else if(adapter.isEnabled()) {
 			listener.bluetoothStateChanged(true);
 			ImageView warning = new ImageView(ctx);
+			warning.setPadding(5, 5, 5, 5);
 			warning.setImageResource(R.drawable.alerts_and_states_warning);
 			addView(warning);
 			status.setText(R.string.bluetooth_not_discoverable);
@@ -70,6 +73,7 @@ public class BluetoothWidget extends LinearLayout implements OnClickListener {
 		} else {
 			listener.bluetoothStateChanged(false);
 			ImageView warning = new ImageView(ctx);
+			warning.setPadding(5, 5, 5, 5);
 			warning.setImageResource(R.drawable.alerts_and_states_warning);
 			addView(warning);
 			status.setText(R.string.bluetooth_disabled);
diff --git a/briar-android/src/net/sf/briar/android/invitation/WifiWidget.java b/briar-android/src/net/sf/briar/android/invitation/WifiWidget.java
index 82b652386ac698163942d04d55559b9c04e64c78..90f34854a7de513a9498dbe14716162f2ff9244c 100644
--- a/briar-android/src/net/sf/briar/android/invitation/WifiWidget.java
+++ b/briar-android/src/net/sf/briar/android/invitation/WifiWidget.java
@@ -42,6 +42,7 @@ public class WifiWidget extends LinearLayout implements OnClickListener {
 		if(wifi == null) {
 			wifiStateChanged(null);
 			ImageView warning = new ImageView(ctx);
+			warning.setPadding(5, 5, 5, 5);
 			warning.setImageResource(R.drawable.alerts_and_states_warning);
 			addView(warning);
 			status.setText(R.string.wifi_not_available);
@@ -53,6 +54,7 @@ public class WifiWidget extends LinearLayout implements OnClickListener {
 			if(networkName == null || networkId == -1) {
 				wifiStateChanged(null);
 				ImageView warning = new ImageView(ctx);
+				warning.setPadding(5, 5, 5, 5);
 				warning.setImageResource(R.drawable.alerts_and_states_warning);
 				addView(warning);
 				status.setText(R.string.wifi_disconnected);
@@ -64,6 +66,7 @@ public class WifiWidget extends LinearLayout implements OnClickListener {
 			} else {
 				wifiStateChanged(networkName);
 				ImageView ok = new ImageView(ctx);
+				ok.setPadding(5, 5, 5, 5);
 				ok.setImageResource(R.drawable.navigation_accept);
 				addView(ok);
 				String format = getResources().getString(
@@ -78,6 +81,7 @@ public class WifiWidget extends LinearLayout implements OnClickListener {
 		} else {
 			wifiStateChanged(null);
 			ImageView warning = new ImageView(ctx);
+			warning.setPadding(5, 5, 5, 5);
 			warning.setImageResource(R.drawable.alerts_and_states_warning);
 			addView(warning);
 			status.setText(R.string.wifi_disabled);
diff --git a/briar-android/src/net/sf/briar/android/messages/ConversationAdapter.java b/briar-android/src/net/sf/briar/android/messages/ConversationAdapter.java
index 867593d40b2d304430da3a07dfbf0cf5118969bb..fadd7f8dc1f24a04f66fc815f46c9d7797da8d72 100644
--- a/briar-android/src/net/sf/briar/android/messages/ConversationAdapter.java
+++ b/briar-android/src/net/sf/briar/android/messages/ConversationAdapter.java
@@ -54,6 +54,7 @@ class ConversationAdapter extends ArrayAdapter<PrivateMessageHeader> {
 		authorLayout.setGravity(CENTER_VERTICAL);
 
 		ImageView thumb = new ImageView(ctx);
+		thumb.setPadding(5, 5, 5, 5);
 		Rating rating = item.getRating();
 		if(rating == GOOD) thumb.setImageResource(R.drawable.rating_good);
 		else if(rating == BAD) thumb.setImageResource(R.drawable.rating_bad);
@@ -65,7 +66,7 @@ class ConversationAdapter extends ArrayAdapter<PrivateMessageHeader> {
 		name.setLayoutParams(WRAP_WRAP_1);
 		name.setTextSize(18);
 		name.setMaxLines(1);
-		name.setPadding(10, 10, 10, 10);
+		name.setPadding(0, 10, 10, 10);
 		name.setText(item.getAuthor().getName());
 		authorLayout.addView(name);
 		innerLayout.addView(authorLayout);
@@ -83,6 +84,7 @@ class ConversationAdapter extends ArrayAdapter<PrivateMessageHeader> {
 			LinearLayout attachmentLayout = new LinearLayout(ctx);
 			attachmentLayout.setOrientation(HORIZONTAL);
 			ImageView attachment = new ImageView(ctx);
+			attachment.setPadding(5, 0, 5, 5);
 			attachment.setImageResource(R.drawable.content_attachment);
 			attachmentLayout.addView(attachment);
 			attachmentLayout.addView(new HorizontalSpace(ctx));
diff --git a/briar-android/src/net/sf/briar/android/messages/ReadPrivateMessageActivity.java b/briar-android/src/net/sf/briar/android/messages/ReadPrivateMessageActivity.java
index b50870f38f4347326fe8890a51357872a90523df..811bbd27ad61358a8cec48ecbdaa954ea6bb600a 100644
--- a/briar-android/src/net/sf/briar/android/messages/ReadPrivateMessageActivity.java
+++ b/briar-android/src/net/sf/briar/android/messages/ReadPrivateMessageActivity.java
@@ -122,6 +122,7 @@ implements OnClickListener {
 		header.setGravity(CENTER_VERTICAL);
 
 		ImageView thumb = new ImageView(this);
+		thumb.setPadding(5, 5, 5, 5);
 		if(rating == GOOD) thumb.setImageResource(R.drawable.rating_good);
 		else if(rating == BAD) thumb.setImageResource(R.drawable.rating_bad);
 		else thumb.setImageResource(R.drawable.rating_unrated);
@@ -132,7 +133,7 @@ implements OnClickListener {
 		name.setLayoutParams(WRAP_WRAP_1);
 		name.setTextSize(18);
 		name.setMaxLines(1);
-		name.setPadding(10, 10, 10, 10);
+		name.setPadding(0, 10, 10, 10);
 		name.setText(authorName);
 		header.addView(name);