diff --git a/packages/rocketchat-ui-master/client/main.js b/packages/rocketchat-ui-master/client/main.js
index 17736ef86227..d718b196722d 100644
--- a/packages/rocketchat-ui-master/client/main.js
+++ b/packages/rocketchat-ui-master/client/main.js
@@ -5,6 +5,7 @@ import s from 'underscore.string';
 RocketChat.settings.collection.find({_id:/theme-color-rc/i}, {fields:{ value: 1 }}).observe({changed: () => { DynamicCss.run(true); }});
 
 this.isFirefox = navigator.userAgent.match(/Firefox\/(\d+)\.\d/);
+this.isChrome = navigator.userAgent.match(/Chrome\/(\d+)\.\d/);
 
 Template.body.onRendered(function() {
 	new Clipboard('.clipboard');
diff --git a/packages/rocketchat-ui/client/components/icon.js b/packages/rocketchat-ui/client/components/icon.js
index c16c92c2c1c8..08f92ca01c28 100644
--- a/packages/rocketchat-ui/client/components/icon.js
+++ b/packages/rocketchat-ui/client/components/icon.js
@@ -1,7 +1,7 @@
-/* globals isFirefox */
+/* globals isFirefox, isChrome */
 
-const firefoxBaseUrlFix = () => `${ window.location.origin }${ FlowRouter.current().path }`;
+const baseUrlFix = () => `${ window.location.origin }${ FlowRouter.current().path }`;
 
 Template.icon.helpers({
-	baseUrl: isFirefox && isFirefox[1] < 55 ? firefoxBaseUrlFix : undefined
+	baseUrl: ((isFirefox && isFirefox[1] < 55) || (isChrome && isChrome[1] < 55)) ? baseUrlFix : undefined
 });