diff --git a/app/frontend/templates/admin/invoices/settings.html b/app/frontend/templates/admin/invoices/settings.html
index 247e97d72..52e2ccb4a 100644
--- a/app/frontend/templates/admin/invoices/settings.html
+++ b/app/frontend/templates/admin/invoices/settings.html
@@ -4,7 +4,7 @@
 </div>
 <form class="invoice-placeholder">
   <div class="invoice-logo">
-    <img src="data:image/png;base64," data-src="holder.js/100%x100%/text:&#xf03e;/font:FontAwesome/icon" bs-holder ng-if="!invoice.logo" class="img-responsive">
+    <img src="data:image/png;base64," data-src="holder.js/100%x100%/text:&#xf03e;/font:'Font Awesome 5 Free'/icon" bs-holder ng-if="!invoice.logo" class="img-responsive">
     <img base-sixty-four-image="invoice.logo" ng-if="invoice.logo && invoice.logo.base64">
     <div class="tools-box">
       <div class="btn-group">
diff --git a/app/frontend/templates/admin/settings/general.html b/app/frontend/templates/admin/settings/general.html
index 9d5b4980a..1c45e5c49 100644
--- a/app/frontend/templates/admin/settings/general.html
+++ b/app/frontend/templates/admin/settings/general.html
@@ -178,7 +178,7 @@
                     <input name="_method" type="hidden" ng-value="methods.logo">
                     <h3 class="m-l" translate>{{ 'app.admin.settings.logo_white_background' }}</h3>
                     <div class="custom-logo" style="background-image: url({{customLogo}});">
-                        <img src="data:image/png;base64," data-src="holder.js/100%x100%/text:&#xf03e;/font:FontAwesome/icon-xs" bs-holder ng-show="!customLogo" class="img-responsive">
+                        <img src="data:image/png;base64," data-src="holder.js/100%x100%/text:&#xf03e;/font:'Font Awesome 5 Free'/icon-xs" bs-holder ng-show="!customLogo" class="img-responsive">
                         <img base-sixty-four-image="customLogo" ng-show="customLogo && customLogo.base64">
                         <img ng-src="{{customLogo.custom_asset_file_attributes.attachment_url}}" alt="{{customLogo.custom_asset_file_attributes.attachment}}" ng-show="customLogo && customLogo.custom_asset_file_attributes" />
                         <div class="tools-box">
@@ -204,7 +204,7 @@
                     <input name="_method" type="hidden" ng-value="methods.logoBlack">
                     <h3 class="m-l" translate>{{ 'app.admin.settings.logo_black_background' }}</h3>
                     <div class="custom-logo bg-dark" style="background-image: url({{customLogoBlack}});">
-                        <img src="data:image/png;base64," data-src="holder.js/100%x100%/text:&#xf03e;/font:FontAwesome/icon-black-xs" bs-holder ng-show="!customLogoBlack" class="img-responsive">
+                        <img src="data:image/png;base64," data-src="holder.js/100%x100%/text:&#xf03e;/font:'Font Awesome 5 Free'/icon-black-xs" bs-holder ng-show="!customLogoBlack" class="img-responsive">
                         <img base-sixty-four-image="customLogoBlack" ng-show="customLogoBlack && customLogoBlack.base64">
                         <img ng-src="{{customLogoBlack.custom_asset_file_attributes.attachment_url}}" alt="{{customLogoBlack.custom_asset_file_attributes.attachment}}" ng-show="customLogoBlack && customLogoBlack.custom_asset_file_attributes" />
                         <div class="tools-box">
@@ -230,7 +230,7 @@
                     <input name="_method" type="hidden" ng-value="methods.favicon">
                     <h3 class="m-l" translate>{{ 'app.admin.settings.favicon' }}</h3>
                     <div class="custom-favicon" style="background-image: url({{customFavicon}});">
-                        <img src="data:image/png;base64," data-src="holder.js/32x32/text:&#xf03e;/font:FontAwesome/icon-xs" bs-holder ng-show="!customFavicon" class="img-responsive">
+                        <img src="data:image/png;base64," data-src="holder.js/32x32/text:&#xf03e;/font:'Font Awesome 5 Free'/icon-xs" bs-holder ng-show="!customFavicon" class="img-responsive">
                         <img base-sixty-four-image="customFavicon" ng-show="customFavicon && customFavicon.base64">
                         <img ng-src="{{customFavicon.custom_asset_file_attributes.attachment_url}}" alt="{{customFavicon.custom_asset_file_attributes.attachment}}" ng-show="customFavicon && customFavicon.custom_asset_file_attributes" />
                         <div class="tools-box">
@@ -292,7 +292,7 @@
                     <input name="_method" type="hidden" ng-value="methods.profileImage">
                     <h3 class="m-l" translate>{{ 'app.admin.settings.background_picture_of_the_profile_banner' }}</h3>
                     <div class="custom-profile-image" style="background-image: url({{profileImage}});">
-                        <img src="data:image/png;base64," data-src="holder.js/100%x100%/text:&#xf03e;/font:FontAwesome/icon-xs" bs-holder ng-show="!profileImage" class="img-responsive">
+                        <img src="data:image/png;base64," data-src="holder.js/100%x100%/text:&#xf03e;/font:'Font Awesome 5 Free'/icon-xs" bs-holder ng-show="!profileImage" class="img-responsive">
                         <img base-sixty-four-image="profileImage" ng-show="profileImage && profileImage.base64">
                         <img ng-src="{{profileImage.custom_asset_file_attributes.attachment_url}}" alt="{{profileImage.custom_asset_file_attributes.attachment}}" ng-show="profileImage && profileImage.custom_asset_file_attributes" />
                         <div class="tools-box">
diff --git a/app/frontend/templates/admin/trainings/_form.html b/app/frontend/templates/admin/trainings/_form.html
index a5a6d36d7..ae5817b43 100644
--- a/app/frontend/templates/admin/trainings/_form.html
+++ b/app/frontend/templates/admin/trainings/_form.html
@@ -33,7 +33,7 @@
       <div class="col-sm-10">
         <div class="fileinput" data-provides="fileinput" ng-class="fileinputClass(training.training_image)">
             <div class="fileinput-new thumbnail" style="width: 334px; height: 250px;">
-                <img src="data:image/png;base64," data-src="holder.js/100%x100%/text:&#xf03e;/font:FontAwesome/icon" bs-holder ng-if="!training.training_image">
+                <img src="data:image/png;base64," data-src="holder.js/100%x100%/text:&#xf03e;/font:'Font Awesome 5 Free'/icon" bs-holder ng-if="!training.training_image">
             </div>
             <div class="fileinput-preview fileinput-exists thumbnail" style="max-width: 334px;">
               <img ng-src="{{ training.training_image }}" alt="" />
diff --git a/app/frontend/templates/events/_form.html b/app/frontend/templates/events/_form.html
index d12bf6527..71b84fb8a 100644
--- a/app/frontend/templates/events/_form.html
+++ b/app/frontend/templates/events/_form.html
@@ -23,7 +23,7 @@
         <div class="col-sm-9">
           <div class="fileinput" data-provides="fileinput" ng-class="fileinputClass(event.event_image)">
             <div class="fileinput-new thumbnail" style="width: 334px; height: 250px;">
-              <img src="data:image/png;base64," data-src="holder.js/100%x100%/text:&#xf03e;/font:FontAwesome/icon" bs-holder ng-if="!event.event_image">
+              <img src="data:image/png;base64," data-src="holder.js/100%x100%/text:&#xf03e;/font:'Font Awesome 5 Free'/icon" bs-holder ng-if="!event.event_image">
             </div>
             <div class="fileinput-preview fileinput-exists thumbnail" data-trigger="fileinput" style="max-width: 334px;">
               <img ng-src="{{ event.event_image }}" alt="" />
diff --git a/app/frontend/templates/events/index.html b/app/frontend/templates/events/index.html
index 75c1fdcae..1202ed146 100644
--- a/app/frontend/templates/events/index.html
+++ b/app/frontend/templates/events/index.html
@@ -74,7 +74,7 @@
             <!-- Event Image -->
             <div class="pull-right crop-155">
               <img class="pull-right" ng-src="{{event.event_image_small}}" title="{{event.title}}" ng-if="event.event_image">
-              <img class="pull-right img-responsive" src="data:image/png;base64," data-src="holder.js/100%x100%/text:&#xf03e;/font:FontAwesome/icon" bs-holder ng-if="!event.event_image">
+              <img class="pull-right img-responsive" src="data:image/png;base64," data-src="holder.js/100%x100%/text:&#xf03e;/font:'Font Awesome 5 Free'/icon" bs-holder ng-if="!event.event_image">
             </div>
 
           </a>
diff --git a/app/frontend/templates/home/events.html b/app/frontend/templates/home/events.html
index 14b7c5951..9d3819a81 100644
--- a/app/frontend/templates/home/events.html
+++ b/app/frontend/templates/home/events.html
@@ -8,7 +8,7 @@
 
       <div class="widget panel panel-default" ui-sref="app.public.events_show({id: event.id})">
         <div class="panel-heading picture" style="background-image: url({{event.event_image_medium}});" >
-          <img src="data:image/png;base64," data-src="holder.js/100%x100%/text:&#xf03e;/font:FontAwesome/icon" bs-holder ng-if="!event.event_image" class="img-responsive">
+          <img src="data:image/png;base64," data-src="holder.js/100%x100%/text:&#xf03e;/font:'Font Awesome 5 Free'/icon" bs-holder ng-if="!event.event_image" class="img-responsive">
         </div>
         <div class="panel-body" style="heigth:170px;">
           <div class="row">
diff --git a/app/frontend/templates/machines/_form.html b/app/frontend/templates/machines/_form.html
index 0d3b707a4..47ae75cf2 100644
--- a/app/frontend/templates/machines/_form.html
+++ b/app/frontend/templates/machines/_form.html
@@ -33,7 +33,7 @@
       <div class="col-sm-10">
         <div class="fileinput" data-provides="fileinput" ng-class="fileinputClass(machine.machine_image)">
             <div class="fileinput-new thumbnail" style="width: 334px; height: 250px;">
-                <img src="data:image/png;base64," data-src="holder.js/100%x100%/text:&#xf03e;/font:FontAwesome/icon" bs-holder ng-if="!machine.machine_image">
+                <img src="data:image/png;base64," data-src="holder.js/100%x100%/text:&#xf03e;/font:'Font Awesome 5 Free'/icon" bs-holder ng-if="!machine.machine_image">
             </div>
             <div class="fileinput-preview fileinput-exists thumbnail" style="max-width: 334px;">
               <img ng-src="{{ machine.machine_image }}" alt="" />
diff --git a/app/frontend/templates/machines/index.html b/app/frontend/templates/machines/index.html
index 8e67d78a7..07f05c985 100644
--- a/app/frontend/templates/machines/index.html
+++ b/app/frontend/templates/machines/index.html
@@ -48,7 +48,7 @@
     <div class="col-xs-12 col-sm-6 col-lg-4 reservable-card" ng-class="{'disabled-reservable' : machine.disabled && machineFiltering === 'all'}" ng-repeat="machine in machines | filterDisabled:machineFiltering">
       <div class="widget panel panel-default">
         <div class="panel-heading picture" ng-if="!machine.machine_image" ng-click="showMachine(machine)">
-          <img src="data:image/png;base64," data-src="holder.js/100%x100%/text:&#xf03e;/font:FontAwesome/icon" bs-holder class="img-responsive">
+          <img src="data:image/png;base64," data-src="holder.js/100%x100%/text:&#xf03e;/font:'Font Awesome 5 Free'/icon" bs-holder class="img-responsive">
         </div>
         <div class="panel-heading picture" style="background-image:url({{machine.machine_image}})" ng-if="machine.machine_image" ng-click="showMachine(machine)">
         </div>
diff --git a/app/frontend/templates/projects/_form.html b/app/frontend/templates/projects/_form.html
index cf5ec2cec..3589d1bd8 100644
--- a/app/frontend/templates/projects/_form.html
+++ b/app/frontend/templates/projects/_form.html
@@ -23,7 +23,7 @@
         <div class="col-sm-10">
           <div class="fileinput" data-provides="fileinput" ng-class="fileinputClass(project.project_image)">
             <div class="fileinput-new thumbnail" style="width: 334px; height: 250px;">
-              <img src="data:image/png;base64," data-src="holder.js/100%x100%/text:&#xf03e;/font:FontAwesome/icon" bs-holder ng-if="!project.project_image">
+              <img src="data:image/png;base64," data-src="holder.js/100%x100%/text:&#xf03e;/font:'Font Awesome 5 Free'/icon" bs-holder ng-if="!project.project_image">
             </div>
             <div class="fileinput-preview fileinput-exists thumbnail" data-trigger="fileinput" style="max-width: 334px;">
               <img ng-src="{{ project.project_image }}" alt="" />
@@ -112,7 +112,7 @@
 
                   <div class="fileinput" data-provides="fileinput" ng-class="fileinputClass(image.attachment)" style="width: 100%;">
                     <div class="fileinput-new thumbnail" style="width: 100%; height: 200px;">
-                      <img src="data:image/png;base64," data-src="holder.js/100%x100%/text:&#xf03e;/font:FontAwesome/icon" bs-holder ng-if="!image.attachment">
+                      <img src="data:image/png;base64," data-src="holder.js/100%x100%/text:&#xf03e;/font:'Font Awesome 5 Free'/icon" bs-holder ng-if="!image.attachment">
                     </div>
                     <div class="fileinput-preview fileinput-exists thumbnail" data-trigger="fileinput" style="max-width: 334px;">
                       <img ng-src="{{ image.attachment_url }}" alt="{{image.attachment}}" />
diff --git a/app/frontend/templates/projects/index.html b/app/frontend/templates/projects/index.html
index d1e490ce6..b15a8e3dd 100644
--- a/app/frontend/templates/projects/index.html
+++ b/app/frontend/templates/projects/index.html
@@ -88,7 +88,7 @@
 
         <div class="card-header">
           <div class="card-header-bg" style="background-image: url({{project.project_image}});">
-            <img src="data:image/png;base64," data-src="holder.js/100%x100%/text:&#xf03e;/font:FontAwesome/icon" bs-holder ng-if="!project.project_image">
+            <img src="data:image/png;base64," data-src="holder.js/100%x100%/text:&#xf03e;/font:'Font Awesome 5 Free'/icon" bs-holder ng-if="!project.project_image">
           </div>
 
         </div>
diff --git a/app/frontend/templates/shared/publicProfile.html.erb b/app/frontend/templates/shared/publicProfile.html.erb
index eb053147c..c94665158 100644
--- a/app/frontend/templates/shared/publicProfile.html.erb
+++ b/app/frontend/templates/shared/publicProfile.html.erb
@@ -94,7 +94,7 @@
 
               <div class="card-header">
                 <div class="card-header-bg" style="background-image: url({{project.project_image}});">
-                  <img src="data:image/png;base64," data-src="holder.js/100%x100%/text:&#xf03e;/font:FontAwesome/icon" bs-holder ng-if="!project.project_image">
+                  <img src="data:image/png;base64," data-src="holder.js/100%x100%/text:&#xf03e;/font:'Font Awesome 5 Free'/icon" bs-holder ng-if="!project.project_image">
                 </div>
 
               </div>
diff --git a/app/frontend/templates/spaces/_form.html b/app/frontend/templates/spaces/_form.html
index 2955ba60f..8c67ee673 100644
--- a/app/frontend/templates/spaces/_form.html
+++ b/app/frontend/templates/spaces/_form.html
@@ -19,7 +19,7 @@
     <div class="col-sm-10">
         <div class="fileinput" data-provides="fileinput" ng-class="fileinputClass(space.space_image)">
             <div class="fileinput-new thumbnail" style="width: 334px; height: 250px;">
-                <img src="data:image/png;base64," data-src="holder.js/100%x100%/text:&#xf03e;/font:FontAwesome/icon" bs-holder ng-if="!space.space_image">
+                <img src="data:image/png;base64," data-src="holder.js/100%x100%/text:&#xf03e;/font:'Font Awesome 5 Free'/icon" bs-holder ng-if="!space.space_image">
             </div>
             <div class="fileinput-preview fileinput-exists thumbnail" style="max-width: 334px;">
                 <img ng-src="{{ space.space_image }}" alt="" />
diff --git a/app/frontend/templates/spaces/index.html b/app/frontend/templates/spaces/index.html
index 1e7126b59..7c530d240 100644
--- a/app/frontend/templates/spaces/index.html
+++ b/app/frontend/templates/spaces/index.html
@@ -49,7 +49,7 @@
   <div class="col-xs-12 col-sm-6 col-md-4 reservable-card" ng-class="{'disabled-reservable' : space.disabled && spaceFiltering === 'all'}" ng-repeat="space in spaces | filterDisabled:spaceFiltering">
     <div class="widget panel panel-default">
       <div class="panel-heading picture" ng-if="!space.space_image" ng-click="showSpace(space)">
-        <img src="data:image/png;base64," data-src="holder.js/100%x100%/text:&#xf03e;/font:FontAwesome/icon" bs-holder class="img-responsive">
+        <img src="data:image/png;base64," data-src="holder.js/100%x100%/text:&#xf03e;/font:'Font Awesome 5 Free'/icon" bs-holder class="img-responsive">
       </div>
       <div class="panel-heading picture" style="background-image:url({{space.space_image}})" ng-if="space.space_image" ng-click="showSpace(space)">
       </div>
diff --git a/app/frontend/templates/trainings/index.html b/app/frontend/templates/trainings/index.html
index 1e232b5d5..e7b39f8b7 100644
--- a/app/frontend/templates/trainings/index.html
+++ b/app/frontend/templates/trainings/index.html
@@ -24,7 +24,7 @@
 
       <div class="widget panel panel-default">
         <div class="panel-heading picture" ng-if="!training.training_image" ng-click="showTraining(training)">
-          <img src="data:image/png;base64," data-src="holder.js/100%x100%/text:&#xf03e;/font:FontAwesome/icon" bs-holder class="img-responsive">
+          <img src="data:image/png;base64," data-src="holder.js/100%x100%/text:&#xf03e;/font:'Font Awesome 5 Free'/icon" bs-holder class="img-responsive">
         </div>
         <div class="panel-heading picture" style="background-image:url({{training.training_image}})" ng-if="training.training_image" ng-click="showTraining(training)">
         </div>