diff --git a/imports/message-read-receipt/server/hooks.js b/imports/message-read-receipt/server/hooks.js
index 560ebf449ac4..4039271580e4 100644
--- a/imports/message-read-receipt/server/hooks.js
+++ b/imports/message-read-receipt/server/hooks.js
@@ -2,6 +2,11 @@ import { ReadReceipt } from './lib/ReadReceipt';
 
 RocketChat.callbacks.add('afterSaveMessage', (message, room) => {
 
+	// skips this callback if the message was edited
+	if (message.editedAt) {
+		return message;
+	}
+
 	// set subscription as read right after message was sent
 	RocketChat.models.Subscriptions.setAsReadByRoomIdAndUserId(room._id, message.u._id);
 
diff --git a/packages/rocketchat-file-upload/server/lib/requests.js b/packages/rocketchat-file-upload/server/lib/requests.js
index 7a47c0496e81..7962e095351f 100644
--- a/packages/rocketchat-file-upload/server/lib/requests.js
+++ b/packages/rocketchat-file-upload/server/lib/requests.js
@@ -1,6 +1,6 @@
 /* globals FileUpload, WebApp */
 
-WebApp.connectHandlers.use(`${ __meteor_runtime_config__.ROOT_URL_PATH_PREFIX }/file-upload/`,	function(req, res, next) {
+WebApp.connectHandlers.use('/file-upload/',	function(req, res, next) {
 
 	const match = /^\/([^\/]+)\/(.*)/.exec(req.url);
 
diff --git a/packages/rocketchat-livechat/.app/client/views/loading.html b/packages/rocketchat-livechat/.app/client/views/loading.html
index e13a3f77ba1c..77310699f18a 100644
--- a/packages/rocketchat-livechat/.app/client/views/loading.html
+++ b/packages/rocketchat-livechat/.app/client/views/loading.html
@@ -1,8 +1,8 @@
 <template name="loading">
 	<div class="loading-animation">
 		{{_ "Connecting to an Agent"}}
-		<div class="bounce1"></div>
-		<div class="bounce2"></div>
-		<div class="bounce3"></div>
+		<div class="bounce bounce1"></div>
+		<div class="bounce bounce2"></div>
+		<div class="bounce bounce3"></div>
 	</div>
-</template>
\ No newline at end of file
+</template>
diff --git a/packages/rocketchat-message-attachments/client/messageAttachment.js b/packages/rocketchat-message-attachments/client/messageAttachment.js
index 8da6606bca34..d0df4d8f3b5f 100644
--- a/packages/rocketchat-message-attachments/client/messageAttachment.js
+++ b/packages/rocketchat-message-attachments/client/messageAttachment.js
@@ -22,7 +22,7 @@ const fixCordova = function(url) {
 	} else if (navigator.userAgent.indexOf('Electron') > -1) {
 		return __meteor_runtime_config__.ROOT_URL_PATH_PREFIX + url;
 	} else {
-		return Meteor.absoluteUrl().replace(/\/$/, '') + __meteor_runtime_config__.ROOT_URL_PATH_PREFIX + url;
+		return Meteor.absoluteUrl().replace(/\/$/, '') + url;
 	}
 };
 /*globals renderMessageBody*/
diff --git a/packages/rocketchat-theme/client/imports/general/base.css b/packages/rocketchat-theme/client/imports/general/base.css
index 28a4e7342769..f4a7f3adcdab 100644
--- a/packages/rocketchat-theme/client/imports/general/base.css
+++ b/packages/rocketchat-theme/client/imports/general/base.css
@@ -30,6 +30,8 @@ body {
 	font-size: var(--text-small-size);
 	-webkit-font-smoothing: antialiased;
 	-moz-osx-font-smoothing: grayscale;
+
+	background-color: var(--rc-color-primary)
 }
 
 :focus {
@@ -205,3 +207,52 @@ button {
 .hidden {
 	display: none;
 }
+
+.loading-animation {
+	position: absolute;
+	top: 0;
+	right: 0;
+	bottom: 0;
+	left: 0;
+
+	display: flex;
+
+	text-align: center;
+	align-items: center;
+	justify-content: center;
+}
+
+.loading-animation > .bounce {
+	display: inline-block;
+
+	width: 10px;
+	height: 10px;
+	margin: 2px;
+
+	animation: loading-bouncedelay 1.4s infinite ease-in-out both;
+
+	border-radius: 100%;
+	background-color: rgba(255, 255, 255, 0.6);
+}
+
+.loading-animation .bounce1 {
+	-webkit-animation-delay: -0.32s;
+	animation-delay: -0.32s;
+}
+
+.loading-animation .bounce2 {
+	-webkit-animation-delay: -0.16s;
+	animation-delay: -0.16s;
+}
+
+@keyframes loading-bouncedelay {
+	0%,
+	80%,
+	100% {
+		transform: scale(0);
+	}
+
+	40% {
+		transform: scale(1);
+	}
+}
diff --git a/packages/rocketchat-theme/client/imports/general/base_old.css b/packages/rocketchat-theme/client/imports/general/base_old.css
index f27c433b735f..50df7449b4c6 100644
--- a/packages/rocketchat-theme/client/imports/general/base_old.css
+++ b/packages/rocketchat-theme/client/imports/general/base_old.css
@@ -1702,8 +1702,7 @@
 	white-space: nowrap;
 	text-overflow: ellipsis;
 
-	color: white;
-	background-color: #04436a;
+	color: var(--rc-color-content);
 
 	font-size: 1.2em;
 	line-height: 40px;
diff --git a/packages/rocketchat-theme/server/colors.less b/packages/rocketchat-theme/server/colors.less
index 89bfaa2391ac..1f7df2e7b369 100755
--- a/packages/rocketchat-theme/server/colors.less
+++ b/packages/rocketchat-theme/server/colors.less
@@ -947,3 +947,7 @@ label.required::after {
 .range-slider-range::-moz-range-track {
 	background-color: @tertiary-background-color;
 }
+
+.announcement {
+	background-color: @primary-background-color;
+}
diff --git a/packages/rocketchat-ui-account/client/accountPreferences.js b/packages/rocketchat-ui-account/client/accountPreferences.js
index 9653e7671291..4e00e3b26247 100644
--- a/packages/rocketchat-ui-account/client/accountPreferences.js
+++ b/packages/rocketchat-ui-account/client/accountPreferences.js
@@ -134,7 +134,6 @@ Template.accountPreferences.onCreated(function() {
 		data.collapseMediaByDefault = JSON.parse($('input[name=collapseMediaByDefault]:checked').val());
 		data.muteFocusedConversations = JSON.parse($('#muteFocusedConversations').find('input:checked').val());
 		data.hideUsernames = JSON.parse($('#hideUsernames').find('input:checked').val());
-		data.hideRoles = JSON.parse($('#hideRoles').find('input:checked').val());
 		data.hideFlexTab = JSON.parse($('#hideFlexTab').find('input:checked').val());
 		data.hideAvatars = JSON.parse($('#hideAvatars').find('input:checked').val());
 		data.sendOnEnter = $('#sendOnEnter').find('select').val();
@@ -152,6 +151,10 @@ Template.accountPreferences.onCreated(function() {
 
 		let reload = false;
 
+		if (RocketChat.settings.get('UI_DisplayRoles')) {
+			data.hideRoles = JSON.parse($('#hideRoles').find('input:checked').val());
+		}
+
 		// if highlights changed we need page reload
 		const highlights = RocketChat.getUserPreference(Meteor.user(), 'highlights');
 		if (highlights && highlights.join('\n') !== data.highlights.join('\n')) {
diff --git a/packages/rocketchat-ui-account/client/accountProfile.html b/packages/rocketchat-ui-account/client/accountProfile.html
index f1a2581b44de..d8300889e5c4 100644
--- a/packages/rocketchat-ui-account/client/accountProfile.html
+++ b/packages/rocketchat-ui-account/client/accountProfile.html
@@ -42,7 +42,7 @@
 													<label class="rc-select-avatar__upload-label avatar" for="upload-avatar">
 														{{> icon block="rc-select-avatar__upload-icon" icon="upload"}}
 													</label>
-													<input type="file" name="" value="" id="upload-avatar" style="display:none;">
+													<input type="file" name="" value="" id="upload-avatar" style="display:none;" accept="image/x-png,image/gif,image/jpeg">
 												</div>
 												<div class="rc-select-avatar__list-item rc-tooltip js-select-avatar-url {{selectUrl}}"  aria-label="{{_ "Use_url_for_avatar" }}">
 													<label class="rc-select-avatar__upload-label avatar">
diff --git a/packages/rocketchat-ui-flextab/client/tabs/uploadedFilesList.js b/packages/rocketchat-ui-flextab/client/tabs/uploadedFilesList.js
index e93b82b6af18..75aededa69b7 100644
--- a/packages/rocketchat-ui-flextab/client/tabs/uploadedFilesList.js
+++ b/packages/rocketchat-ui-flextab/client/tabs/uploadedFilesList.js
@@ -23,7 +23,7 @@ const fixCordova = (url) => {
 	} else if (navigator.userAgent.indexOf('Electron') > -1) {
 		return __meteor_runtime_config__.ROOT_URL_PATH_PREFIX + url;
 	} else {
-		return Meteor.absoluteUrl().replace(/\/$/, '') + __meteor_runtime_config__.ROOT_URL_PATH_PREFIX + url;
+		return Meteor.absoluteUrl().replace(/\/$/, '') + url;
 	}
 };
 
diff --git a/packages/rocketchat-ui-flextab/client/tabs/userEdit.html b/packages/rocketchat-ui-flextab/client/tabs/userEdit.html
index 9eb49f5af292..41285ff3a39e 100644
--- a/packages/rocketchat-ui-flextab/client/tabs/userEdit.html
+++ b/packages/rocketchat-ui-flextab/client/tabs/userEdit.html
@@ -2,7 +2,7 @@
 	{{#unless canEditOrAdd}}
 		<p class="secondary-font-color">{{_ "You_are_not_authorized_to_view_this_page"}}</p>
 	{{else}}
-	<form class="" action="index.html" method="post" >
+	<form class="" action="index.html" method="post" autocomplete="off">
 		<div class="rc-input rc-form-group rc-form-group--small">
 			<label class="rc-input__label">
 				<div class="rc-input__title">{{_ "Name"}}</div>
diff --git a/packages/rocketchat-ui-master/package.js b/packages/rocketchat-ui-master/package.js
index dedf7eea4e99..e2b51652edf8 100644
--- a/packages/rocketchat-ui-master/package.js
+++ b/packages/rocketchat-ui-master/package.js
@@ -28,5 +28,4 @@ Package.onUse(function(api) {
 
 	api.addFiles('server/inject.js', 'server');
 	api.addAssets('public/icons.svg', 'server');
-	api.addAssets('public/loading.css', 'server');
 });
diff --git a/packages/rocketchat-ui-master/public/loading.css b/packages/rocketchat-ui-master/public/loading.css
deleted file mode 100644
index 42984694f28c..000000000000
--- a/packages/rocketchat-ui-master/public/loading.css
+++ /dev/null
@@ -1,48 +0,0 @@
-.loading-animation {
-	position: absolute;
-	top: 0;
-	right: 0;
-	bottom: 0;
-	left: 0;
-
-	display: flex;
-
-	text-align: center;
-	align-items: center;
-	justify-content: center;
-}
-
-.loading-animation > .bounce {
-	display: inline-block;
-
-	width: 10px;
-	height: 10px;
-	margin: 2px;
-
-	animation: loading-bouncedelay 1.4s infinite ease-in-out both;
-
-	border-radius: 100%;
-	background-color: rgba(255, 255, 255, 0.6);
-}
-
-.loading-animation .bounce1 {
-	-webkit-animation-delay: -0.32s;
-	animation-delay: -0.32s;
-}
-
-.loading-animation .bounce2 {
-	-webkit-animation-delay: -0.16s;
-	animation-delay: -0.16s;
-}
-
-@keyframes loading-bouncedelay {
-	0%,
-	80%,
-	100% {
-		transform: scale(0);
-	}
-
-	40% {
-		transform: scale(1);
-	}
-}
diff --git a/packages/rocketchat-ui-master/server/inject.js b/packages/rocketchat-ui-master/server/inject.js
index 4f70c56de2da..d83897f88900 100644
--- a/packages/rocketchat-ui-master/server/inject.js
+++ b/packages/rocketchat-ui-master/server/inject.js
@@ -29,16 +29,14 @@ RocketChat.models.Settings.find({_id:/theme-color-rc/i}, {fields: { value: 1}}).
 
 Inject.rawHead('dynamic', `<script>(${ require('./dynamic-css.js').default.toString().replace(/\/\/.*?\n/g, '') })()</script>`);
 
-Inject.rawHead('page-loading', `<style>${ Assets.getText('public/loading.css') }</style>`);
-
 Inject.rawBody('icons', Assets.getText('public/icons.svg'));
 
 Inject.rawBody('page-loading-div', `
 <div id="initial-page-loading" class="page-loading">
 	<div class="loading-animation">
-		<div class="bounce1"></div>
-		<div class="bounce2"></div>
-		<div class="bounce3"></div>
+		<div class="bounce bounce1"></div>
+		<div class="bounce bounce2"></div>
+		<div class="bounce bounce3"></div>
 	</div>
 </div>`);
 
@@ -71,8 +69,7 @@ RocketChat.settings.get('Assets_SvgFavicon_Enable', (key, value) => {
 });
 
 RocketChat.settings.get('theme-color-sidebar-background', (key, value) => {
-	Inject.rawHead(key, `<style>body { background-color: ${ value };}</style>` +
-						`<meta name="msapplication-TileColor" content="${ value }" />` +
+	Inject.rawHead(key, `<meta name="msapplication-TileColor" content="${ value }" />` +
 						`<meta name="theme-color" content="${ value }" />`);
 });
 
diff --git a/tests/chimp-config.js b/tests/chimp-config.js
index 46fb2a6c369a..d03dcfc8273a 100644
--- a/tests/chimp-config.js
+++ b/tests/chimp-config.js
@@ -19,7 +19,7 @@ module.exports = {
 // 	showXolvioMessages: true,
 
 // 	// - - - - CUCUMBER - - - -
-	path: 'tests/end-to-end/ui',
+	path: 'tests/end-to-end',
 	// 	format: 'pretty',
 	// 	tags: '~@ignore',
 	// 	singleSnippetPerFile: true,
diff --git a/tests/end-to-end/ui/06-messaging.js b/tests/end-to-end/ui/06-messaging.js
index 046ac2247f3f..2da8a28aa9c1 100644
--- a/tests/end-to-end/ui/06-messaging.js
+++ b/tests/end-to-end/ui/06-messaging.js
@@ -267,6 +267,7 @@ describe('[Message]', () => {
 
 	describe('[GENERAL Channel]', () => {
 		before(()=>{
+			checkIfUserIsValid(username, email, password);
 			sideNav.spotlightSearchIcon.click();
 			sideNav.spotlightSearch.waitForVisible(10000);
 			sideNav.searchChannel('general');
diff --git a/tests/end-to-end/ui/11-admin.js b/tests/end-to-end/ui/11-admin.js
index 4cb754fadb1b..c1775330f1f9 100644
--- a/tests/end-to-end/ui/11-admin.js
+++ b/tests/end-to-end/ui/11-admin.js
@@ -22,7 +22,7 @@ describe('[Administration]', () => {
 		sideNav.preferencesClose.click();
 	});
 
-	describe.only('[Admin View]', () => {
+	describe('[Admin View]', () => {
 		before(() => {
 			sideNav.sidebarMenu.click();
 			sideNav.admin.waitForVisible(5000);