diff --git a/module/rdd-roll.js b/module/rdd-roll.js
index 1151eb5f..05d92015 100644
--- a/module/rdd-roll.js
+++ b/module/rdd-roll.js
@@ -234,19 +234,24 @@ export class RdDRoll extends Dialog {
       this.rollData[attribute] = event.currentTarget.checked;
       this.updateRollResult();
     });
-    html.find('.imgAppelAuMoral').click((event) => { /* l'appel au moral, qui donne un bonus de +1 */
+    html.find('.appel-moral').click((event) => { /* l'appel au moral, qui donne un bonus de +1 */
       this.rollData.useMoral = !this.rollData.useMoral;
+      const appelMoral = html.find('.icon-appel-moral')[0];
+      const tooltip = html.find('.tooltipAppelAuMoralText')[0];
+      appelMoral.classList.remove('fa-grin-beam');
+      appelMoral.classList.remove('fa-sad-tear');
+      appelMoral.classList.remove('fa-meh');
       if (this.rollData.useMoral) {
         if (this.rollData.moral > 0) {
-          html.find('.imgAppelAuMoral')[0].src = "/systems/foundryvtt-reve-de-dragon/icons/moral-heureux.svg";
-          html.find('.tooltipAppelAuMoralText')[0].innerHTML = "Appel au moral";
+          appelMoral.classList.add('fa-grin-beam');
+          tooltip.innerHTML = "Appel au moral";
         } else {
-          html.find('.imgAppelAuMoral')[0].src = "/systems/foundryvtt-reve-de-dragon/icons/moral-malheureux.svg";
-          html.find('.tooltipAppelAuMoralText')[0].innerHTML = "Appel à l'énergie du désespoir";
+          appelMoral.classList.add('fa-sad-tear');
+          tooltip.innerHTML = "Appel à l'énergie du désespoir";
         }
       } else {
-        html.find('.imgAppelAuMoral')[0].src = "/systems/foundryvtt-reve-de-dragon/icons/moral-neutre.svg";
-        html.find('.tooltipAppelAuMoralText')[0].innerHTML = "Sans appel au moral";
+        appelMoral.classList.add('fa-meh');
+        tooltip.innerHTML = "Sans appel au moral";
       }
       this.updateRollResult();
     });
@@ -306,7 +311,7 @@ export class RdDRoll extends Dialog {
 
     HtmlUtility._showControlWhen($(".diffMoral"), rollData.ajustements.moralTotal.used);
     HtmlUtility._showControlWhen($(".divAppelAuMoral"), rollData.use.appelAuMoral);
-    HtmlUtility._showControlWhen($("#etat-general"), !RdDCarac.isIgnoreEtatGeneral(rollData.selectedCarac, rollData.competence));
+    HtmlUtility._showControlWhen($("#etat-general"), !RdDCarac.isIgnoreEtatGeneral(rollData));
     HtmlUtility._showControlWhen($("#ajust-astrologique"), RdDResolutionTable.isAjustementAstrologique(rollData));
 
     // Mise à jour valeurs
diff --git a/styles/simple.css b/styles/simple.css
index ace91dcf..ce6b5a85 100644
--- a/styles/simple.css
+++ b/styles/simple.css
@@ -393,7 +393,7 @@ table {border: 1px solid #7a7971;}
   border-bottom: 1px solid #BBB;
 }
 
-.blessure-inactive{
+.fas-inactive{
   color:rgba(150, 150, 150, 0.4)
 }
 .blessure-active-legere{
@@ -900,14 +900,6 @@ ul, li {
   display: none !important;
 }
 
-.imgAppelAuMoral	 {
-  height: 20px;
-  width: 20px;
-  border:none;
-  outline: none;
-  background-size: cover;
-}
-
 /* Tooltip container */
 .tooltipAppelAuMoral {
   position: relative;
diff --git a/templates/actor-blessure-partial.html b/templates/actor-blessure-partial.html
index fd9afe68..8788169f 100644
--- a/templates/actor-blessure-partial.html
+++ b/templates/actor-blessure-partial.html
@@ -2,11 +2,8 @@
   <td class="item-control blessure-control" title="Blessure {{title}}" data-blessure-active="{{bless.active}}">
     {{#if bless.active}}
     <i class="fas fa-skull-crossbones blessure-active-{{gravite}}"></i>
-    {{!--   <i class="fas fa-first-aid"></i> --}}    
-    {{!--   <i class="fas fa-plus-square"></i> --}}    
     {{else}}
-    {{!--    <i class="fas fa-genderless"></i>    --}}    
-      <i class="fas fa-skull-crossbones blessure-inactive"></i>
+    <i class="fas fa-skull-crossbones fas-inactive"></i>
     {{/if}}
   </td>
   <td>
diff --git a/templates/actor-sheet.html b/templates/actor-sheet.html
index 35825de3..7381a734 100644
--- a/templates/actor-sheet.html
+++ b/templates/actor-sheet.html
@@ -113,9 +113,9 @@
         <div class="tab items" data-group="primary" data-tab="carac">
           <div class="grid grid-2col">
             <div class="flex-group-left flexcol">
-              <span><a class="lock-unlock-sheet"><img class="small-button-container" 
-                src="systems/foundryvtt-reve-de-dragon/icons/{{#if options.editCaracComp}}unlocked.svg{{else}}locked.svg{{/if}}" alt="blocker/débloquer"
-                >{{#if options.editCaracComp}}Verrouiller{{else}}Déverrouiller{{/if}}</a></span>
+              <span><a class="lock-unlock-sheet"><i class="fas fa-lock{{#if options.editCaracComp}}-open{{/if}}"></i>
+                {{#if options.editCaracComp}}Verrouiller{{else}}Déverrouiller{{/if}}
+              </a></span>
               <ul class="carac-list alterne-list">
                 {{#each data.carac as |carac key|}}
                     {{#if carac.isLevelUp}}
@@ -202,9 +202,9 @@
                         {{else if (eq compteur.label 'Ethylisme')}}
                         <a class="item-control ethylisme-test" id="ethylisme-test" title="Jet d'Ethylisme">Jet d'Ethylisme</a>
                         {{else if (eq compteur.label 'Moral')}}
-                        <a class="moral-malheureux" title="Jet de moral situation malheureuse"><img class="small-button-container" src="systems/foundryvtt-reve-de-dragon/icons/moral-malheureux.svg" alt="Jet de moral situation malheureuse"/></a>
-                        <a class="moral-neutre" title="Jet de moral situation neutre"><img class="small-button-container" src="systems/foundryvtt-reve-de-dragon/icons/moral-neutre.svg" alt="Jet de moral situation neutre"/></a>
-                        <a class="moral-heureux" title="Jet de moral situation heureuse"><img class="small-button-container" src="systems/foundryvtt-reve-de-dragon/icons/moral-heureux.svg" alt="Jet de moral situation heureuse"/></a>
+                        <a class="moral-malheureux" title="Jet de moral situation malheureuse"><i class="far fa-sad-tear"></i></a>
+                        <a class="moral-neutre" title="Jet de moral situation neutre"><i class="far fa-meh"></i></a>
+                        <a class="moral-heureux" title="Jet de moral situation heureuse"><i class="far fa-grin-beam"></i></a>
                         {{else}}
                         <label></label>
                       {{/if}}
@@ -221,15 +221,15 @@
         {{!-- Compétences Tab --}}
         <div class="tab competences" data-group="primary" data-tab="competences">
           <div class="flexrow">
-            <span><a class="lock-unlock-sheet"><img class="small-button-container" 
-              src="systems/foundryvtt-reve-de-dragon/icons/{{#if options.editCaracComp}}unlocked.svg{{else}}locked.svg{{/if}}" alt="blocker/débloquer"
-              >{{#if options.editCaracComp}}Verrouiller{{else}}Déverrouiller{{/if}}</a></span>
-            <span><a id="show-hide-competences"><img class="small-button-container" 
-              src="systems/foundryvtt-reve-de-dragon/icons/{{#if options.showCompNiveauBase}}no-filter.svg{{else}}filter.svg{{/if}}" alt="filter/montrer tout"
-              >{{#if options.showCompNiveauBase}}Montrer tout{{else}}Filtrer{{/if}}</a></span> 
-            <span><a id="show-hide-archetype"><img class="small-button-container" 
-              src="systems/foundryvtt-reve-de-dragon/icons/{{#if options.montrerArchetype}}no-filter.svg{{else}}filter.svg{{/if}}" alt="filter/montrer l'archétype"
-              >{{#if options.montrerArchetype}}Masquer l'archétype{{else}}Voir l'archétype{{/if}}</a></span> 
+            <span><a class="lock-unlock-sheet"><i class="fas fa-lock{{#if options.editCaracComp}}-open{{/if}}"></i>
+              {{#if options.editCaracComp}}Verrouiller{{else}}Déverrouiller{{/if}}
+            </a></span>
+            <span><a id="show-hide-competences"><i class="fas fa-filter {{#unless options.showCompNiveauBase}}fas-inactive{{/unless}}"></i>
+              {{#if options.showCompNiveauBase}}Montrer tout{{else}}Filtrer{{/if}}
+            </a></span> 
+            <span><a id="show-hide-archetype"><i class="fas fa-eye{{#if options.montrerArchetype}}-slash{{/if}}"></i>
+              {{#if options.montrerArchetype}}Masquer l'archétype{{else}}Voir l'archétype{{/if}}
+            </a></span>
           </div>
           <div class="grid grid-2col">
             <div class="flex-group-left flexcol competence-column">
diff --git a/templates/partial-roll-moral.html b/templates/partial-roll-moral.html
index 2d268bac..39201e0f 100644
--- a/templates/partial-roll-moral.html
+++ b/templates/partial-roll-moral.html
@@ -1,7 +1,9 @@
 <div class="flexrow">
   <label class="diffMoral">Moral: {{#if (gt moral 0)}}+{{/if}}{{moral}}</label>
   <div class="tooltipAppelAuMoral divAppelAuMoral">
-    <img class="imgAppelAuMoral small-button-container" src="/systems/foundryvtt-reve-de-dragon/icons/moral-neutre.svg">
+    <a class="appel-moral">
+      <i class="far fa-meh icon-appel-moral"></i>
+    </a>
     <span class="tooltipAppelAuMoralText">Sans appel au moral</span>
   </div>
 </div>