diff --git a/app/src/main/java/com/keylesspalace/tusky/adapter/StatusBaseViewHolder.java b/app/src/main/java/com/keylesspalace/tusky/adapter/StatusBaseViewHolder.java
index 28531293e..6c51e74d1 100644
--- a/app/src/main/java/com/keylesspalace/tusky/adapter/StatusBaseViewHolder.java
+++ b/app/src/main/java/com/keylesspalace/tusky/adapter/StatusBaseViewHolder.java
@@ -232,8 +232,10 @@ abstract class StatusBaseViewHolder extends RecyclerView.ViewHolder {
previews[i].setVisibility(View.VISIBLE);
- if (previewUrl == null || previewUrl.isEmpty()) {
- Picasso.with(context).load(mediaPreviewUnloadedId).into(previews[i]);
+ if (TextUtils.isEmpty(previewUrl)) {
+ Picasso.with(context)
+ .load(mediaPreviewUnloadedId)
+ .into(previews[i]);
} else {
Picasso.with(context)
.load(previewUrl)
diff --git a/app/src/main/java/com/keylesspalace/tusky/adapter/StatusViewHolder.java b/app/src/main/java/com/keylesspalace/tusky/adapter/StatusViewHolder.java
index 9d7f5ce82..db5c80f76 100644
--- a/app/src/main/java/com/keylesspalace/tusky/adapter/StatusViewHolder.java
+++ b/app/src/main/java/com/keylesspalace/tusky/adapter/StatusViewHolder.java
@@ -62,7 +62,7 @@ public class StatusViewHolder extends StatusBaseViewHolder {
avatarReblog.setVisibility(View.VISIBLE);
Picasso.with(context)
.load(rebloggedUrl)
- .fit()
+ .placeholder(R.drawable.avatar_default)
.transform(new RoundedTransformation(25))
.into(avatarReblog);
} else {
diff --git a/app/src/main/res/drawable-anydpi-v21/avatar_default.xml b/app/src/main/res/drawable-anydpi-v21/avatar_default.xml
new file mode 100644
index 000000000..af6c2bef7
--- /dev/null
+++ b/app/src/main/res/drawable-anydpi-v21/avatar_default.xml
@@ -0,0 +1,36 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res/drawable-hdpi/avatar_default.png b/app/src/main/res/drawable-hdpi/avatar_default.png
new file mode 100644
index 000000000..fe84271ad
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/avatar_default.png differ
diff --git a/app/src/main/res/drawable-mdpi/avatar_default.png b/app/src/main/res/drawable-mdpi/avatar_default.png
new file mode 100644
index 000000000..20665406e
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/avatar_default.png differ
diff --git a/app/src/main/res/drawable-xhdpi/avatar_default.png b/app/src/main/res/drawable-xhdpi/avatar_default.png
new file mode 100644
index 000000000..1baf777c2
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/avatar_default.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/avatar_default.png b/app/src/main/res/drawable-xxhdpi/avatar_default.png
new file mode 100644
index 000000000..14e97fe73
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/avatar_default.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/avatar_default.png b/app/src/main/res/drawable-xxxhdpi/avatar_default.png
new file mode 100644
index 000000000..59f56039d
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/avatar_default.png differ
diff --git a/app/src/main/res/drawable/avatar_default.png b/app/src/main/res/drawable/avatar_default.png
deleted file mode 100644
index 88462d68c..000000000
Binary files a/app/src/main/res/drawable/avatar_default.png and /dev/null differ
diff --git a/app/src/main/res/layout/item_autocomplete.xml b/app/src/main/res/layout/item_autocomplete.xml
index 128dfc609..ff640f4ae 100644
--- a/app/src/main/res/layout/item_autocomplete.xml
+++ b/app/src/main/res/layout/item_autocomplete.xml
@@ -1,5 +1,6 @@
+ tools:src="@drawable/avatar_default" />
+ android:textStyle="normal|bold"
+ tools:text="\@ConnyDuck" />
+ android:textSize="?attr/status_text_medium"
+ tools:text="Conny Duck" />
diff --git a/assets/avatar_default.svg b/assets/avatar_default.svg
new file mode 100644
index 000000000..4db822cba
--- /dev/null
+++ b/assets/avatar_default.svg
@@ -0,0 +1,64 @@
+
+