diff --git a/packages/rocketchat-ui/client/components/icon.html b/packages/rocketchat-ui/client/components/icon.html
index d875feb5db3..fd29bd068e0 100644
--- a/packages/rocketchat-ui/client/components/icon.html
+++ b/packages/rocketchat-ui/client/components/icon.html
@@ -1,5 +1,5 @@
 <template name="icon">
 	<svg class="rc-icon {{block}} {{block}}--{{icon}} {{classes}}" aria-hidden="true">
-		<use xlink:href="#icon-{{icon}}"></use>
+		<use xlink:href="{{baseUrl}}#icon-{{icon}}"></use>
 	</svg>
 </template>
diff --git a/packages/rocketchat-ui/client/components/icon.js b/packages/rocketchat-ui/client/components/icon.js
new file mode 100644
index 00000000000..9b28194ee99
--- /dev/null
+++ b/packages/rocketchat-ui/client/components/icon.js
@@ -0,0 +1,11 @@
+/* globals isFirefox */
+
+Template.icon.helpers({
+	baseUrl() {
+		if (isFirefox) {
+			return window.location.href.replace(window.location.hash, '');
+		}
+
+		return '';
+	}
+});
diff --git a/packages/rocketchat-ui/package.js b/packages/rocketchat-ui/package.js
index f23eb29a360..2c999425071 100644
--- a/packages/rocketchat-ui/package.js
+++ b/packages/rocketchat-ui/package.js
@@ -120,6 +120,7 @@ Package.onUse(function(api) {
 	api.addFiles('client/views/app/photoswipe.js', 'client');
 
 	api.addFiles('client/components/icon.html', 'client');
+	api.addFiles('client/components/icon.js', 'client');
 
 	api.addFiles('client/components/popupList.html', 'client');
 	api.addFiles('client/components/popupList.js', 'client');