diff --git a/Changelog.md b/Changelog.md
index 1950e38aa..dd763cecd 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,7 @@
 ## Refactor
 * Internationalize controller rescue\_from text [#6554](https://github.com/diaspora/diaspora/pull/6554)
 * Make mention parsing a bit more robust [#6658](https://github.com/diaspora/diaspora/pull/6658)
+* Remove unlicensed images [#6673](https://github.com/diaspora/diaspora/pull/6673)
 
 ## Bug fixes
 * Fix plural rules handling more than wanted as "one" [#6630](https://github.com/diaspora/diaspora/pull/6630)
diff --git a/app/assets/images/user/uma.jpg b/app/assets/images/user/uma.jpg
deleted file mode 100644
index a299280c5..000000000
Binary files a/app/assets/images/user/uma.jpg and /dev/null differ
diff --git a/app/assets/images/user/wolf.jpg b/app/assets/images/user/wolf.jpg
deleted file mode 100644
index 1322ec6d2..000000000
Binary files a/app/assets/images/user/wolf.jpg and /dev/null differ
diff --git a/spec/javascripts/helpers/factory.js b/spec/javascripts/helpers/factory.js
index 40aeaf39f..5b812a48c 100644
--- a/spec/javascripts/helpers/factory.js
+++ b/spec/javascripts/helpers/factory.js
@@ -44,9 +44,9 @@ var factory = {
       "id": id,
       "diaspora_id": "bob@bob.com",
       "avatar":{
-        "large":"http://localhost:3000/assets/user/uma.jpg",
-        "medium":"http://localhost:3000/assets/user/uma.jpg",
-        "small":"http://localhost:3000/assets/user/uma.jpg"}
+        "large":"http://localhost:3000/assets/user/default.png",
+        "medium":"http://localhost:3000/assets/user/default.png",
+        "small":"http://localhost:3000/assets/user/default.png"}
     };
 
     return _.extend(defaultAttrs, overrides);
@@ -90,9 +90,9 @@ var factory = {
       "full_name": "bob grimm",
       "gender": "robot",
       "id": id,
-      "image_url": "http:\/\/localhost:3000\/assets\/user\/wolf.jpg",
-      "image_url_medium": "http:\/\/localhost:3000\/assets\/user\/wolf.jpg",
-      "image_url_small": "http:\/\/localhost:3000\/assets\/user\/wolf.jpg",
+      "image_url": "http://localhost:3000/assets/user/default.png",
+      "image_url_medium": "http://localhost:3000/assets/user/default.png",
+      "image_url_small": "http://localhost:3000/assets/user/default.png",
       "last_name": "Grimm",
       "location": "Earth",
       "nsfw": false,