diff --git a/public/css/app.css b/public/css/app.css
index 1b3866aca..2ac68eb06 100644
Binary files a/public/css/app.css and b/public/css/app.css differ
diff --git a/public/css/appdark.css b/public/css/appdark.css
index ca0795d46..c26a5ad5b 100644
Binary files a/public/css/appdark.css and b/public/css/appdark.css differ
diff --git a/public/css/landing.css b/public/css/landing.css
index d7879c311..f8c9bb831 100644
Binary files a/public/css/landing.css and b/public/css/landing.css differ
diff --git a/public/css/quill.css b/public/css/quill.css
index a1b638f27..f11350023 100644
Binary files a/public/css/quill.css and b/public/css/quill.css differ
diff --git a/public/js/ace.js b/public/js/ace.js
index 97bb5535f..1db9a5634 100644
Binary files a/public/js/ace.js and b/public/js/ace.js differ
diff --git a/public/js/activity.js b/public/js/activity.js
index 7d764b10e..ea1f06f23 100644
Binary files a/public/js/activity.js and b/public/js/activity.js differ
diff --git a/public/js/app.js b/public/js/app.js
index e04883334..2acbbcd62 100644
Binary files a/public/js/app.js and b/public/js/app.js differ
diff --git a/public/js/collectioncompose.js b/public/js/collectioncompose.js
index c6d9d4653..7d894f3fd 100644
Binary files a/public/js/collectioncompose.js and b/public/js/collectioncompose.js differ
diff --git a/public/js/collections.js b/public/js/collections.js
index 73d16f07c..1d1498c92 100644
Binary files a/public/js/collections.js and b/public/js/collections.js differ
diff --git a/public/js/components.js b/public/js/components.js
index c517dc219..4f3858e2b 100644
Binary files a/public/js/components.js and b/public/js/components.js differ
diff --git a/public/js/compose-classic.js b/public/js/compose-classic.js
index 64a1d15e0..3c11c0415 100644
Binary files a/public/js/compose-classic.js and b/public/js/compose-classic.js differ
diff --git a/public/js/compose.js b/public/js/compose.js
index 760d06c34..fd66f001c 100644
Binary files a/public/js/compose.js and b/public/js/compose.js differ
diff --git a/public/js/developers.js b/public/js/developers.js
index 762be82a9..6e3921e04 100644
Binary files a/public/js/developers.js and b/public/js/developers.js differ
diff --git a/public/js/discover.js b/public/js/discover.js
index fa8723b6d..1112882e8 100644
Binary files a/public/js/discover.js and b/public/js/discover.js differ
diff --git a/public/js/hashtag.js b/public/js/hashtag.js
index cbbca1065..1ba73386b 100644
Binary files a/public/js/hashtag.js and b/public/js/hashtag.js differ
diff --git a/public/js/loops.js b/public/js/loops.js
index 3d7b1ed35..8f89853f5 100644
Binary files a/public/js/loops.js and b/public/js/loops.js differ
diff --git a/public/js/manifest.js b/public/js/manifest.js
index 386a4c06b..5aca81a88 100644
Binary files a/public/js/manifest.js and b/public/js/manifest.js differ
diff --git a/public/js/mode-dot.js b/public/js/mode-dot.js
index 2313ae88e..32ccc1e22 100644
Binary files a/public/js/mode-dot.js and b/public/js/mode-dot.js differ
diff --git a/public/js/profile-directory.js b/public/js/profile-directory.js
index f82efa7cc..6e920b96b 100644
Binary files a/public/js/profile-directory.js and b/public/js/profile-directory.js differ
diff --git a/public/js/profile.js b/public/js/profile.js
index c03d9d734..c920ad918 100644
Binary files a/public/js/profile.js and b/public/js/profile.js differ
diff --git a/public/js/quill.js b/public/js/quill.js
index e926fa313..c54d8feb6 100644
Binary files a/public/js/quill.js and b/public/js/quill.js differ
diff --git a/public/js/search.js b/public/js/search.js
index bda907926..5c0bf03f9 100644
Binary files a/public/js/search.js and b/public/js/search.js differ
diff --git a/public/js/status.js b/public/js/status.js
index f426a195b..1c6ce543f 100644
Binary files a/public/js/status.js and b/public/js/status.js differ
diff --git a/public/js/theme-monokai.js b/public/js/theme-monokai.js
index 314581d0f..46c07b07f 100644
Binary files a/public/js/theme-monokai.js and b/public/js/theme-monokai.js differ
diff --git a/public/js/timeline.js b/public/js/timeline.js
index f2f765a13..7d4a1c869 100644
Binary files a/public/js/timeline.js and b/public/js/timeline.js differ
diff --git a/public/js/vendor.js b/public/js/vendor.js
index 7a39decc7..a6cb1ab79 100644
Binary files a/public/js/vendor.js and b/public/js/vendor.js differ
diff --git a/public/mix-manifest.json b/public/mix-manifest.json
index 8f416d91c..425439664 100644
Binary files a/public/mix-manifest.json and b/public/mix-manifest.json differ
diff --git a/resources/assets/js/app.js b/resources/assets/js/app.js
index e11123cc9..8a88f5b3b 100644
--- a/resources/assets/js/app.js
+++ b/resources/assets/js/app.js
@@ -16,11 +16,22 @@ if (token) {
 
 window.App = window.App || {};
 
+window.App.redirect = function() {
+	document.querySelectorAll('a').forEach(function(i,k) { 
+		let a = i.getAttribute('href');
+		if(a && a.length > 5 && a.startsWith('https://')) {
+			let url = new URL(a);
+			if(url.host !== window.location.host && url.pathname !== '/i/redirect') {
+				i.setAttribute('href', '/i/redirect?url=' + encodeURIComponent(a));
+			}
+		}
+	});
+}
+
 window.App.boot = function() {
 	new Vue({ el: '#content'});
 }
 
-
 window.App.util = {
 	time: (function() { 
 		return new Date; 
diff --git a/resources/assets/js/components/Hashtag.vue b/resources/assets/js/components/Hashtag.vue
index 7657c3dcb..89719331b 100644
--- a/resources/assets/js/components/Hashtag.vue
+++ b/resources/assets/js/components/Hashtag.vue
@@ -136,7 +136,7 @@
 			},
 
 			infiniteLoader($state) {
-				if(this.page > (this.authenticated ? 19 : 3)) {
+				if(this.page > (this.authenticated ? 29 : 10)) {
 					$state.complete();
 					return;
 				}
diff --git a/resources/assets/js/components/NotificationCard.vue b/resources/assets/js/components/NotificationCard.vue
index de90195e2..70eaa3032 100644
--- a/resources/assets/js/components/NotificationCard.vue
+++ b/resources/assets/js/components/NotificationCard.vue
@@ -15,7 +15,7 @@
 			</div>
 			<div class="card-body pt-2 px-0 py-0 contents" style="max-height: 230px; overflow-y: scroll;">
 				<div v-if="notifications.length > 0" class="media align-items-center px-3 py-2 border-bottom border-light" v-for="(n, index) in notifications">
-					<img class="mr-2 rounded-circle" style="border:1px solid #ccc" :src="n.account.avatar" alt="" width="32px" height="32px">
+					<img class="mr-2 rounded-circle" style="border:1px solid #ccc" :src="n.account.avatar" alt="" width="32px" height="32px" onerror="this.onerror=null;this.src='/storage/avatars/default.png';">
 					<div class="media-body font-weight-light small">
 						<div v-if="n.type == 'favourite'">
 							<p class="my-0">
diff --git a/resources/assets/js/components/Timeline.vue b/resources/assets/js/components/Timeline.vue
index c22de5492..45563ee4d 100644
--- a/resources/assets/js/components/Timeline.vue
+++ b/resources/assets/js/components/Timeline.vue
@@ -182,7 +182,9 @@
 											<span v-html="reply.content"></span>
 										</span>
 										<span class="mb-0" style="min-width:38px">
-											<span v-on:click="likeStatus(reply, $event)"><i v-bind:class="[reply.favourited ? 'fas fa-heart fa-sm text-danger cursor-pointer':'far fa-heart fa-sm text-lighter cursor-pointer']"></i></span>
+											<span v-on:click="likeStatus(reply, $event)">
+												<i v-bind:class="[reply.favourited ? 'fas fa-heart fa-sm text-danger cursor-pointer':'far fa-heart fa-sm text-lighter cursor-pointer']"></i>
+											</span>
 											<!-- <post-menu :status="reply" :profile="profile" size="sm" :modal="'true'" :feed="feed" class="d-inline-flex pl-2"></post-menu> -->
 											<span class="text-lighter pl-2 cursor-pointer" @click="ctxMenu(reply)">
 												<span class="fas fa-ellipsis-v text-lighter"></span>