diff --git a/webapp/sources/rudder/rudder-web/src/main/elm/sources/Editor/ViewMethodsList.elm b/webapp/sources/rudder/rudder-web/src/main/elm/sources/Editor/ViewMethodsList.elm
index a123351c54f..b9df636072d 100644
--- a/webapp/sources/rudder/rudder-web/src/main/elm/sources/Editor/ViewMethodsList.elm
+++ b/webapp/sources/rudder/rudder-web/src/main/elm/sources/Editor/ViewMethodsList.elm
@@ -188,7 +188,7 @@ showCategory  category allDeprecated =
                  , attribute "data-bs-placement" "bottom", attribute "data-title" category
                  , attribute "data-bs-content" "<div>All generic methods in this category are <b>deprecated</b>.</div>"
                  , attribute "data-bs-html" "true"
-                 ] [ i [ class "glyphicon glyphicon-info-sign deprecated-icon" ] []]
+                 ] [ i [ class "fa fa-info-circle deprecated-icon" ] []]
           ]
         else []
       )
diff --git a/webapp/sources/rudder/rudder-web/src/main/elm/sources/Editor/ViewTechniqueList.elm b/webapp/sources/rudder/rudder-web/src/main/elm/sources/Editor/ViewTechniqueList.elm
index 87c91555792..c2bf8eee2bc 100644
--- a/webapp/sources/rudder/rudder-web/src/main/elm/sources/Editor/ViewTechniqueList.elm
+++ b/webapp/sources/rudder/rudder-web/src/main/elm/sources/Editor/ViewTechniqueList.elm
@@ -176,7 +176,7 @@ draftsItem model draft =
                 span [ class "cursor-help popover-bs", attribute "data-bs-toggle"  "popover", attribute "data-trigger" "hover"
                      , attribute "data-bs-container" "body", attribute  "data-bs-placement" "right", attribute "data-title" draft.technique.name
                      , attribute "data-bs-content" "<div>This technique uses <b>deprecated</b> generic methods.</div>"
-                     , attribute "data-bs-html" "true" ] [ i [ class "glyphicon glyphicon-info-sign deprecated-icon" ] [] ]
+                     , attribute "data-bs-html" "true" ] [ i [ class "fa fa-info-circle deprecated-icon" ] [] ]
               else
                 text ""
             ]
@@ -219,7 +219,7 @@ techniqueItem model technique =
                 span [ class "cursor-help popover-bs", attribute "data-bs-toggle"  "popover", attribute "data-trigger" "hover"
                      , attribute "data-bs-container" "body", attribute  "data-bs-placement" "right", attribute "data-title" technique.name
                      , attribute "data-bs-content" "<div>This technique uses <b>deprecated</b> generic methods.</div>"
-                     , attribute "data-bs-html" "true" ] [ i [ class "glyphicon glyphicon-info-sign deprecated-icon" ] [] ]
+                     , attribute "data-bs-html" "true" ] [ i [ class "fa fa-info-circle deprecated-icon" ] [] ]
               else
                 text ""
             , if hasUnknownMethod  then
diff --git a/webapp/sources/rudder/rudder-web/src/main/elm/sources/Editor/ViewTechniqueTabs.elm b/webapp/sources/rudder/rudder-web/src/main/elm/sources/Editor/ViewTechniqueTabs.elm
index 689ffc98a2b..09c0395ad39 100644
--- a/webapp/sources/rudder/rudder-web/src/main/elm/sources/Editor/ViewTechniqueTabs.elm
+++ b/webapp/sources/rudder/rudder-web/src/main/elm/sources/Editor/ViewTechniqueTabs.elm
@@ -216,7 +216,7 @@ techniqueTab model technique creation ui =
                                                       ) errors)
                              _ -> if String.length technique.id.value > 100 then
                                     span [ class "rudder-text-warning col-sm-8 col-sm-offset-3" ] [
-                                      b [] [ span [ class "glyphicon glyphicon-exclamation-sign" ] [] ]
+                                      b [] [ span [ class "fa fa-exclamation-triangle" ] [] ]
                                     , text "Technique IDs longer than 100 characters may not work on some filesystems (Windows, in particular)."
                                     ]
                                   else text ""
diff --git a/webapp/sources/rudder/rudder-web/src/main/elm/sources/FileManager/View.elm b/webapp/sources/rudder/rudder-web/src/main/elm/sources/FileManager/View.elm
index b917c1f475a..4337384a556 100644
--- a/webapp/sources/rudder/rudder-web/src/main/elm/sources/FileManager/View.elm
+++ b/webapp/sources/rudder/rudder-web/src/main/elm/sources/FileManager/View.elm
@@ -71,7 +71,7 @@ bar model =
   , div [class "fm-bar-actions"]
     [ div [class "btn-group"]
       [ button [attribute "data-bs-toggle" "dropdown", id "dropDownMenuSearch", type_ "button", class "btn btn-flat btn-sm dropdown-toggle"]
-        [ i [class "glyphicon glyphicon-search mr2"][]
+        [ i [class "fa fa-search mr2"][]
         ]
       , ul [class "dropdown-menu search-dropdown pull-right"]
         [ li[]
@@ -80,16 +80,16 @@ bar model =
       ]
     , ( if model.viewMode == GridView then
       button [class "btn btn-flat btn-sm", onClick (ChangeViewMode ListView)]
-      [ i [class "glyphicon glyphicon-th-list"][]
+      [ i [class "fa fa-list"][]
       ]
       else
       button [class "btn btn-flat btn-sm", onClick (ChangeViewMode GridView)]
-      [ i [class "glyphicon glyphicon-th-large" ][]
+      [ i [class "fa fa-th-large" ][]
       ]
       )
     , div [class "btn-group"]
       [ button [attribute "data-bs-toggle" "dropdown", id "more", type_ "button", class "btn btn-flat btn-sm dropdown-toggle"]
-        [ i [class "glyphicon glyphicon-option-vertical"][]
+        [ i [class "fa fa-ellipsis-v"][]
         ]
       , mainContextMenu
       ]
@@ -346,13 +346,13 @@ mainContextMenu =
   ul[class "dropdown-menu pull-right"]
   [ li[]
     [ a [ onClick (OpenNameDialog (NewDir "")) ]
-      [ i [class "glyphicon glyphicon-plus"][]
+      [ i [class "fa fa-plus"][]
       , text "New folder"
       ]
     ]
   , li[]
     [ a [ onClick ChooseFiles ]
-      [ i [class "glyphicon glyphicon-cloud-upload"][]
+      [ i [class "fa fa-cloud-upload-alt"][]
       , text "Upload files"
       ]
     ]
diff --git a/webapp/sources/rudder/rudder-web/src/main/elm/sources/NodeProperties/ViewUtils.elm b/webapp/sources/rudder/rudder-web/src/main/elm/sources/NodeProperties/ViewUtils.elm
index bcbd8a3ed3f..a475d24bfb6 100644
--- a/webapp/sources/rudder/rudder-web/src/main/elm/sources/NodeProperties/ViewUtils.elm
+++ b/webapp/sources/rudder/rudder-web/src/main/elm/sources/NodeProperties/ViewUtils.elm
@@ -235,7 +235,7 @@ displayNodePropertyRow model =
               ]
             , td [class "text-center edit-actions is-edited" ]
               [ div []
-                [ span [ class "action-icon glyphicon glyphicon-share-alt cancel-icon", title "Cancel", onClick (ToggleEditProperty p.name eP False)][]
+                [ span [ class "action-icon fa fa-share-square cancel-icon", title "Cancel", onClick (ToggleEditProperty p.name eP False)][]
                 , span [ class "action-icon fa fa-check text-success", title "Save", onClick (ToggleEditProperty p.name eP True)][]
                 ]
               ]
diff --git a/webapp/sources/rudder/rudder-web/src/main/elm/sources/Rules/ViewTabContent.elm b/webapp/sources/rudder/rudder-web/src/main/elm/sources/Rules/ViewTabContent.elm
index f5c9d9e7c82..179c6646582 100644
--- a/webapp/sources/rudder/rudder-web/src/main/elm/sources/Rules/ViewTabContent.elm
+++ b/webapp/sources/rudder/rudder-web/src/main/elm/sources/Rules/ViewTabContent.elm
@@ -87,7 +87,7 @@ informationTab model details =
     rightCol =
       if isNewRule then
         div [class "callout-fade callout-info"]
-        [ div [class "marker"][span [class "glyphicon glyphicon-info-sign"][]]
+        [ div [class "marker"][span [class "fa fa-info-circle"][]]
         , div []
           [ p[][text "You are creating a new rule. You may already want to apply directives and groups to it."]
           , p[][text "To do so, please go to their corresponding tab, or use the shortcuts below:"]
diff --git a/webapp/sources/rudder/rudder-web/src/main/elm/sources/TechniqueVersion/ViewUtils.elm b/webapp/sources/rudder/rudder-web/src/main/elm/sources/TechniqueVersion/ViewUtils.elm
index 1a6fe2385e3..48d8593a71c 100644
--- a/webapp/sources/rudder/rudder-web/src/main/elm/sources/TechniqueVersion/ViewUtils.elm
+++ b/webapp/sources/rudder/rudder-web/src/main/elm/sources/TechniqueVersion/ViewUtils.elm
@@ -22,7 +22,7 @@ displayTechniqueRow model =
         [ text technique.version
         , ( if technique.isDeprecated then
           span
-          [ class "glyphicon glyphicon-info-sign text-danger deprecatedTechniqueIcon"
+          [ class "fa fa-info-circle text-danger deprecatedTechniqueIcon"
           , attribute "data-bs-toggle" "tooltip"
           , attribute "data-bs-placement" "top"
           , attribute "data-bs-html" "true"
diff --git a/webapp/sources/rudder/rudder-web/src/main/javascript/rudder/directive-inputs.js b/webapp/sources/rudder/rudder-web/src/main/javascript/rudder/directive-inputs.js
index d8c81359d8a..57f29e42419 100644
--- a/webapp/sources/rudder/rudder-web/src/main/javascript/rudder/directive-inputs.js
+++ b/webapp/sources/rudder/rudder-web/src/main/javascript/rudder/directive-inputs.js
@@ -452,9 +452,9 @@ function updatePasswordFormView(formId){
   formContainer.find(".reveal-password").each(function(){
     var data = $(this).attr("data-reveal");
     var reveal    = data === "current" ? passwordForm.current.show : passwordForm.newPassword.show
-    var iconClass = reveal ? "glyphicon glyphicon-eye-close" : "glyphicon glyphicon-eye-open"
+    var iconClass = reveal ? "fa fa-eye-slash" : "fa fa-eye"
     var inputType = reveal ? "text" : "password";
-    $(this).find(".glyphicon").attr("class", iconClass);
+    $(this).find(".fa").attr("class", iconClass);
     if(data === "current"){
       formContainer.find("input.input-current-passwd").attr("type", inputType);
     }else{
diff --git a/webapp/sources/rudder/rudder-web/src/main/javascript/rudder/rudder.js b/webapp/sources/rudder/rudder-web/src/main/javascript/rudder/rudder.js
index 4c5dd38f5a6..d62bf23bf92 100644
--- a/webapp/sources/rudder/rudder-web/src/main/javascript/rudder/rudder.js
+++ b/webapp/sources/rudder/rudder-web/src/main/javascript/rudder/rudder.js
@@ -449,7 +449,7 @@ function createTextAgentPolicyMode(isNode, currentPolicyMode, explanation){
   var policyMode = currentPolicyMode.toLowerCase();
   var nodeOrDirective = isNode ? "node" : "directive";
   var labelType = "label-"+policyMode;
-  var span = "<span class='label-text " + labelType + " glyphicon glyphicon-question-sign' data-bs-toggle='tooltip' data-bs-placement='top' title=''></span>"
+  var span = "<span class='label-text " + labelType + " fa fa-question-circle' data-bs-toggle='tooltip' data-bs-placement='top' title=''></span>"
   var badge = $(span).get(0);
   var tooltip = policyModeTooltip(nodeOrDirective, policyMode, explanation);
   badge.setAttribute("title", tooltip);
diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/comet/AsyncDeployment.scala b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/comet/AsyncDeployment.scala
index 52b2a86cbd2..6f56d06a510 100644
--- a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/comet/AsyncDeployment.scala
+++ b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/comet/AsyncDeployment.scala
@@ -150,7 +150,7 @@ class AsyncDeployment extends CometActor with CometListener with Loggable {
                       <div class="panel-heading" role="tab" id="collapseListGroupHeading1">
                         <h4 class="panel-title">
                           Show technical details
-                          <span id="showhidetechnicalerrors" class="glyphicon glyphicon-chevron-up up"></span>
+                          <span id="showhidetechnicalerrors" class="fa fa-chevron-up up"></span>
                         </h4>
                       </div>
                     </a>
diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/AutoCompleteAutoSubmit.scala b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/AutoCompleteAutoSubmit.scala
index a67719dae65..dd82c2802ea 100644
--- a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/AutoCompleteAutoSubmit.scala
+++ b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/AutoCompleteAutoSubmit.scala
@@ -247,7 +247,7 @@ class AutoCompleteAutoSubmit {
           {Script(onLoad)}
         </head>
         <label class="input-group-addon" for={id}>
-          <span class="glyphicon glyphicon-search"></span>
+          <span class="fa fa-search"></span>
         </label>
         {
           attrs.foldLeft(<input type="text" id={id} value={start} />)(_ % _)
diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/DirectiveEditForm.scala b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/DirectiveEditForm.scala
index cc06451f572..31e6b336dea 100644
--- a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/DirectiveEditForm.scala
+++ b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/DirectiveEditForm.scala
@@ -420,7 +420,7 @@ class DirectiveEditForm(
     if (isADirectiveCreation) {
       <div class="callout-fade callout-info">
         <div class="marker">
-          <span class="glyphicon glyphicon-info-sign"></span>
+          <span class="fa fa-info-circle"></span>
         </div>
         <div class="">
           <p>You are creating a new Directive. You must set its parameters before saving.</p>
@@ -528,7 +528,7 @@ class DirectiveEditForm(
         <div>
           <b>Priority</b>
           <span>
-            <span class="ruddericon glyphicon glyphicon-question-sign" data-bs-toggle="tooltip" title={tooltipContent}></span>
+            <span class="ruddericon fa fa-question-circle" data-bs-toggle="tooltip" title={tooltipContent}></span>
           </span>
         </div>
       }
@@ -594,7 +594,7 @@ class DirectiveEditForm(
     <label class="wbBaseFieldLabel">
       <b>Policy mode</b>
       <span>
-        <span class="ruddericon glyphicon glyphicon-question-sign" data-bs-toggle="tooltip" title={tooltipContent}></span>
+        <span class="ruddericon fa fa-question-circle" data-bs-toggle="tooltip" title={tooltipContent}></span>
       </span>
     </label>
   }
diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/popup/CreateOrUpdateGlobalParameterPopup.scala b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/popup/CreateOrUpdateGlobalParameterPopup.scala
index 05b843918d3..7d011e3f3c4 100644
--- a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/popup/CreateOrUpdateGlobalParameterPopup.scala
+++ b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/popup/CreateOrUpdateGlobalParameterPopup.scala
@@ -94,7 +94,7 @@ class CreateOrUpdateGlobalParameterPopup(
       <h4 class="col-lg-12 col-sm-12 col-xs-12 audit-title">Change Request</h4>
               <hr class="css-fix"/>
               <div class="text-center alert alert-info">
-                <span class="glyphicon glyphicon-info-sign"></span>
+                <span class="fa fa-info-circle"></span>
                 Workflows are enabled, your change has to be validated in a Change request
               </div>
     case false => NodeSeq.Empty
diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/popup/CreateRulePopup.scala b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/popup/CreateRulePopup.scala
index 2662d641e3d..d4ee48d4041 100644
--- a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/popup/CreateRulePopup.scala
+++ b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/popup/CreateRulePopup.scala
@@ -111,7 +111,7 @@ class CreateOrCloneRulePopup(
           if (clonedRule.isDefined) {
             <hr class="css-fix"/>
             <div class="alert alert-info text-center">
-                <span class="glyphicon glyphicon-info-sign"></span>
+                <span class="fa fa-info-circle"></span>
                 The new rule will be disabled.
             </div>
           } else {
diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/popup/ModificationValidationPopup.scala b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/popup/ModificationValidationPopup.scala
index a8fb93c21bb..2fecdfd075b 100644
--- a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/popup/ModificationValidationPopup.scala
+++ b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/popup/ModificationValidationPopup.scala
@@ -302,7 +302,7 @@ class ModificationValidationPopup(
       <h4 class="col-lg-12 col-sm-12 col-xs-12 audit-title">Change Request</h4>
       <hr class="css-fix"/>
       <div class="col-lg-12 col-sm-12 col-xs-12 alert alert-info text-center">
-        <span class="glyphicon glyphicon-info-sign"></span>
+        <span class="fa fa-info-circle"></span>
         Workflows are enabled in Rudder, your change has to be validated in a Change request
         {
         if (directiveCreation)
diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/popup/RuleModificationValidationPopup.scala b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/popup/RuleModificationValidationPopup.scala
index 9aabfdf8eef..825c2e24253 100644
--- a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/popup/RuleModificationValidationPopup.scala
+++ b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/popup/RuleModificationValidationPopup.scala
@@ -124,7 +124,7 @@ class RuleModificationValidationPopup(
           <h4 class="col-lg-12 col-sm-12 col-xs-12 audit-title">Change Request</h4>
           <hr class="css-fix"/>
           <div class="text-center alert alert-info">
-            <span class="glyphicon glyphicon-info-sign"></span>
+            <span class="fa fa-info-circle"></span>
             Workflows are enabled, your change has to be validated in a Change request
           </div>
       case false => explanationMessages(changeRequest.action)
diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/administration/DatabaseManagement.scala b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/administration/DatabaseManagement.scala
index 485f1a01ac6..91265f3c016 100644
--- a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/administration/DatabaseManagement.scala
+++ b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/administration/DatabaseManagement.scala
@@ -181,7 +181,7 @@ class DatabaseManagement extends DispatchSnippet with Loggable {
 
     val dialog = {
       <div class="callout-fade callout-info">
-        <div class="marker"><span class="glyphicon glyphicon-exclamation-sign"></span></div>
+        <div class="marker"><span class="fa fa-exclamation-triangle"></span></div>
         Are you sure you want to
         <b>{action.name}</b>
         reports older than
diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/administration/EditPolicyServerAllowedNetwork.scala b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/administration/EditPolicyServerAllowedNetwork.scala
index 3266ba398bf..9919e1a54fd 100644
--- a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/administration/EditPolicyServerAllowedNetwork.scala
+++ b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/administration/EditPolicyServerAllowedNetwork.scala
@@ -222,7 +222,7 @@ class EditPolicyServerAllowedNetwork extends DispatchSnippet with Loggable {
               val id = "network_" + i
 
               (
-                ".deleteNetwork" #> SHtml.ajaxButton(<span class="glyphicon glyphicon-minus"></span>, () => delete(i)) &
+                ".deleteNetwork" #> SHtml.ajaxButton(<span class="fa fa-minus"></span>, () => delete(i)) &
                 "#errorNetworkField" #> <div><span class={
                   "lift:Msg?errorClass=bs-text-danger;id=errornetwork_" + i
                 }>[error]</span></div> &
@@ -236,7 +236,7 @@ class EditPolicyServerAllowedNetwork extends DispatchSnippet with Loggable {
           }
         } &
         "#addNetworkButton" #> SHtml.ajaxButton(
-          <span class="glyphicon glyphicon-plus"></span>,
+          <span class="fa fa-plus"></span>,
           add _,
           ("id", s"addNetworkButton${policyServerId.value}")
         ) &
diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/administration/PropertiesManagement.scala b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/administration/PropertiesManagement.scala
index 6a77f17e143..bc709f0903e 100644
--- a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/administration/PropertiesManagement.scala
+++ b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/administration/PropertiesManagement.scala
@@ -252,7 +252,7 @@ class PropertiesManagement extends DispatchSnippet with Loggable {
     "#mandatoryTooltip *" #> {
       initMandatory.map { b: Boolean =>
         <span data-bs-toggle="tooltip" title="If this option is enabled, users will be forced to enter a change audit log. Empty messages will not be accepted.">
-            <span class="glyphicon glyphicon-info-sign info"></span>
+            <span class="fa fa-info-circle info"></span>
           </span>
       }.getOrElse(NodeSeq.Empty)
     } &
@@ -260,7 +260,7 @@ class PropertiesManagement extends DispatchSnippet with Loggable {
     "#explanationTooltip *" #> {
       initExplanation.map { s: String =>
         <span data-bs-toggle="tooltip" title="Content of the text displayed to prompt the user to enter a change audit log.">
-            <span class="glyphicon glyphicon-info-sign info"></span>
+            <span class="fa fa-info-circle info"></span>
           </span>
       }.getOrElse(NodeSeq.Empty)
     } &
@@ -315,7 +315,7 @@ class PropertiesManagement extends DispatchSnippet with Loggable {
       initDenyBadClocks match {
         case Full(_) =>
           <span data-bs-toggle="tooltip" title="By default, copying configuration policy to nodes requires system clocks to be synchronized to within an hour. Disabling this will bypass this check, but may open a window for replay attacks.">
-              <span class="glyphicon glyphicon-info-sign info"></span>
+              <span class="fa fa-info-circle info"></span>
             </span>
 
         case _ => NodeSeq.Empty
@@ -437,7 +437,7 @@ class PropertiesManagement extends DispatchSnippet with Loggable {
           case Full(_) =>
             <span data-bs-toggle="tooltip" title="If this is checked, when rsync synchronization method is used, folder /var/rudder/share will be synchronized using rsync.
               If this is not checked, you'll have to synchronize yourself this folder">
-              <span><span class="glyphicon glyphicon-info-sign info"></span></span>
+              <span><span class="fa fa-info-circle info"></span></span>
             </span>
 
           case _ => NodeSeq.Empty
@@ -462,7 +462,7 @@ class PropertiesManagement extends DispatchSnippet with Loggable {
           case Full(_) =>
             <span data-bs-toggle="tooltip" title="If this is checked, when rsync synchronization method is used, folder /var/rudder/configuration-repository/shared-files will be synchronized using rsync.
               If this is not checked, you'll have to synchronize yourself this folder">
-              <span><span class="glyphicon glyphicon-info-sign info"></span></span>
+              <span><span class="fa fa-info-circle info"></span></span>
             </span>
           case _       => NodeSeq.Empty
         }
diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/node/AcceptNode.scala b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/node/AcceptNode.scala
index 2b12b7a81ed..23e1701ed14 100644
--- a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/node/AcceptNode.scala
+++ b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/node/AcceptNode.scala
@@ -332,7 +332,7 @@ class AcceptNode extends Loggable {
             Text("Directive"),
             { e =>
               SHtml.ajaxButton(
-                <span><i class="glyphicon glyphicon-search"></i></span>,
+                <span><i class="fa fa-search"></i></span>,
                 () => showExpectedPolicyPopup(e),
                 ("class", "smallButton")
               )
diff --git a/webapp/sources/rudder/rudder-web/src/main/style/rudder/rudder-datatable.css b/webapp/sources/rudder/rudder-web/src/main/style/rudder/rudder-datatable.css
index 9a6409d920b..8d0d72d1521 100644
--- a/webapp/sources/rudder/rudder-web/src/main/style/rudder/rudder-datatable.css
+++ b/webapp/sources/rudder/rudder-web/src/main/style/rudder/rudder-datatable.css
@@ -423,7 +423,7 @@ td.listclose:after {
 #nodePropertiesTab .is-edited .action-icon{
   top: 6px;
 }
-#nodePropertiesTab .action-icon.glyphicon{
+#nodePropertiesTab .action-icon{
   font-size: 17px;
   padding-bottom: 2px;
 }
diff --git a/webapp/sources/rudder/rudder-web/src/main/style/rudder/rudder-main.css b/webapp/sources/rudder/rudder-web/src/main/style/rudder/rudder-main.css
index 4f33f680127..afd050bcd90 100644
--- a/webapp/sources/rudder/rudder-web/src/main/style/rudder/rudder-main.css
+++ b/webapp/sources/rudder/rudder-web/src/main/style/rudder/rudder-main.css
@@ -346,7 +346,7 @@ pre.json-beautify code.elmsh {
   min-height:6em;
 }
 /* ICON INFO */
-.glyphicon.info{
+.fa.info{
   top: -2px;
   margin-left: 10px;
   font-size: 16px;
@@ -354,7 +354,7 @@ pre.json-beautify code.elmsh {
   cursor: help;
   transition-duration:.2s;
 }
-.glyphicon.info:hover{
+.fa.info:hover{
   color:#738195;
 }
 .no-hpadding{
@@ -396,7 +396,7 @@ pre.json-beautify code.elmsh {
 .navbar-nav > li > a {
   padding: 15px;
 }
-.navbar-nav a .glyphicon,.navbar-nav a:hover .glyphicon,.navbar-nav a:focus .glyphicon {
+.navbar-nav a .fa, .navbar-nav a:focus .fa {
   color: #36474E;
 }
 .navbar-nav a .fa-sign-out{
@@ -428,7 +428,7 @@ pre.json-beautify code.elmsh {
 .sidebar-collapse .sidebar-menu>li>.treeview-menu {
   margin-top: -2px;
 }
-.sidebar-menu>li>a>span>span>.fa, .sidebar-menu>li>a>span>span>.glyphicon, .sidebar-menu>li>a>span>span>.ion {
+.sidebar-menu>li>a>span>span>.fa, .sidebar-menu>li>a>span>span>.ion {
   width: 20px;
 }
 .rudder_col>.portlet,.rudder_col>.content-wrapper >.ui-widget-content {
@@ -525,10 +525,6 @@ pre.json-beautify code.elmsh {
   display: inline-block;
 }
 /* --- ACCEPT NEW NODES --- */
-.tabInform .glyphicon{
-  margin: 0 6px 0 4px;
-  transform: scale(1.2);
-}
 .action-btns{
   float: left;
   width: 100%;
@@ -1139,7 +1135,7 @@ form .tooltip-content p {
   line-height: 96px;
   transform: rotate(45deg);
 }
-.callout-fade div.marker span.glyphicon,.callout-fade div.marker span.fa{
+.callout-fade div.marker span.fa{
   transform:rotate(-45deg);
   transition-duration:.2s;
 }
@@ -1572,7 +1568,7 @@ form.rudder-form .policymode-group .btn-group .btn.enforce.active{
 .rudder-form .button-group-success{
   margin-top: 15px;
 }
-.close-message.glyphicon {
+.close-message {
   color: rgba(0, 0, 0, .3);
   top: 2px;
   left: 2px;
@@ -2101,9 +2097,6 @@ ul > li.rudder-form.form-sm > .input-group label.form-control{
 ul.list-sm > li.rudder-form > .input-group .input-group-addon{
   padding: 0 11px;
 }
-ul > li.rudder-form > .input-group label.form-control .glyphicon.info{
-  top:3px;
-}
 ul > li.rudder-form:last-child > .input-group label.form-control{
   border-bottom-right-radius:4px;
 }
@@ -2284,7 +2277,7 @@ h3.box-title {
   margin-top:6px;
   margin-bottom:6px;
 }
-.box-header>.fa, .box-header>.glyphicon, .box-header>.ion, .box-header .box-title{
+.box-header>.fa, .box-header>.ion, .box-header .box-title{
   color:#041922;
 }
 .box .box-title .fa{
@@ -2361,7 +2354,7 @@ h3.box-title {
   padding: 5px 10px !important;
   background-color: #fff !important;
 }
-.box-tools > .btn > .fa,.box-tools > .btn > .glyphicon,.box-tools > .btn > .ion{
+.box-tools > .btn > .fa,.box-tools > .btn > .ion{
   margin-left: 6px;
 }
 .btn.new-icon:after{
diff --git a/webapp/sources/rudder/rudder-web/src/main/style/rudder/rudder-menu.scss b/webapp/sources/rudder/rudder-web/src/main/style/rudder/rudder-menu.scss
index e86177bf491..1f2144d1ee3 100644
--- a/webapp/sources/rudder/rudder-web/src/main/style/rudder/rudder-menu.scss
+++ b/webapp/sources/rudder/rudder-web/src/main/style/rudder/rudder-menu.scss
@@ -89,7 +89,7 @@ $navbar-hover-color : #F4F4F4;
   }
 }
 
-.navbar .navbar-nav>li.user>a > .fa,.navbar .navbar-nav>li.user>a > .glyphicon,.navbar .navbar-nav>li.user>a > .ion {
+.navbar .navbar-nav>li.user>a > .fa, .navbar .navbar-nav>li.user>a > .ion {
   margin-right: 5px
 }
 .navbar .navbar-nav>li>a > .label {
@@ -247,7 +247,7 @@ header.main-header .logo-lg img{
   position: relative;
   line-height: 20px;
 }
-.sidebar-menu>li>a > .fa,.sidebar-menu>li>a > .glyphicon,.sidebar-menu>li>a > .ion {
+.sidebar-menu>li>a > .fa, .sidebar-menu>li>a > .ion {
   width: 20px
 }
 .sidebar-menu>li .badge,.sidebar-menu>li .label {
@@ -289,7 +289,7 @@ header.main-header .logo-lg img{
   display: block;
   font-size: 14px
 }
-.sidebar-menu .treeview-menu>li>a > .fa,.sidebar-menu .treeview-menu>li>a > .glyphicon,.sidebar-menu .treeview-menu>li>a > .ion {
+.sidebar-menu .treeview-menu>li>a > .fa, .sidebar-menu .treeview-menu>li>a > .ion {
   width: 20px
 }
 .sidebar-menu .treeview-menu>li>a > .fa-angle-down,.sidebar-menu .treeview-menu>li>a > .fa-angle-left {
@@ -387,7 +387,7 @@ header.main-header .logo-lg img{
 .dropdown-menu>li>a {
   color: #777
 }
-.dropdown-menu>li>a > .fa,.dropdown-menu>li>a > .glyphicon,.dropdown-menu>li>a > .ion {
+.dropdown-menu>li>a > .fa, .dropdown-menu>li>a > .ion {
   margin-right: 10px
 }
 .dropdown-menu>li>a:hover {
@@ -474,7 +474,7 @@ header.main-header .logo-lg img{
   white-space: nowrap;
   padding: 10px
 }
-.navbar-nav .notifications-menu>.dropdown-menu > li > a > .fa,.navbar-nav .notifications-menu>.dropdown-menu > li > a > .glyphicon,.navbar-nav .notifications-menu>.dropdown-menu > li > a > .ion {
+.navbar-nav .notifications-menu>.dropdown-menu > li > a > .fa, .navbar-nav .notifications-menu>.dropdown-menu > li > a > .ion {
   width: 20px
 }
 
@@ -725,14 +725,14 @@ header.main-header .logo-lg img{
 .treeview-menu>li>a.active {
   color: #fff;
 }
-.treeview-menu>li>a .fa,.treeview-menu>li>a .glyphicon {
+.treeview-menu>li>a .fa {
   visibility:hidden;
   color: #13beb7;
   position:relative;
   color: #13beb7;
   left:-2px;
 }
-.treeview-menu>li>a.active .fa,.treeview-menu>li>a.active .glyphicon {
+.treeview-menu>li>a.active .fa {
   visibility:visible;
 }
 
@@ -1106,9 +1106,7 @@ header.main-header .logo-lg img{
 .no-click{
   cursor:default !important;
 }
-.content-wrapper .nav > li > a:hover .glyphicon, .content-wrapper .nav > li > a:focus .glyphicon, .content-wrapper .nav li.dropdown > a:hover .glyphicon, .content-wrapper .nav li.dropdown > a:focus .glyphicon {
-  color: #FFFFFF;
-}
+
 /* ----- </DROPDOWN MENU>  ----- */
 
 /* === PLUGIN WARNING ===*/
diff --git a/webapp/sources/rudder/rudder-web/src/main/style/rudder/rudder-node.scss b/webapp/sources/rudder/rudder-web/src/main/style/rudder/rudder-node.scss
index 21ecc05f721..942cd2eda70 100644
--- a/webapp/sources/rudder/rudder-web/src/main/style/rudder/rudder-node.scss
+++ b/webapp/sources/rudder/rudder-web/src/main/style/rudder/rudder-node.scss
@@ -342,7 +342,7 @@ $node-logo-size: 50px;
 }
 
 
-.callout-fade.callout-info p .glyphicon{
+.callout-fade.callout-info p .fa{
   margin-right: 5px;
   color: #1b809e;
 }
diff --git a/webapp/sources/rudder/rudder-web/src/main/style/rudder/rudder-template.css b/webapp/sources/rudder/rudder-web/src/main/style/rudder/rudder-template.css
index 203433f56c2..14c205f6faa 100644
--- a/webapp/sources/rudder/rudder-web/src/main/style/rudder/rudder-template.css
+++ b/webapp/sources/rudder/rudder-web/src/main/style/rudder/rudder-template.css
@@ -810,7 +810,7 @@ ul {
   color: #ef9600;
 }
 .rudder-template .dataTable td.empty .fa:first-child,
-.rudder-template .callout-fade .fa:first-child,
+.rudder-template .callout-fade :not(.marker) .fa:first-child,
 .rudder-template .callout-fade .rudder-label:first-child,
 .rudder-template .alert .fa:first-child{
   margin-right: 6px;
diff --git a/webapp/sources/rudder/rudder-web/src/main/style/rudder/rudder.css b/webapp/sources/rudder/rudder-web/src/main/style/rudder/rudder.css
index cc95e7a98e0..81f3e671811 100644
--- a/webapp/sources/rudder/rudder-web/src/main/style/rudder/rudder.css
+++ b/webapp/sources/rudder/rudder-web/src/main/style/rudder/rudder.css
@@ -1307,7 +1307,7 @@ button.buttonMargin {
   opacity : 1;
 }
 
-#generation-status .glyphicon {
+#generation-status .fa {
   top: 0;
   font-size : 11px;
 }
@@ -1329,10 +1329,6 @@ label span.text-fit{
   padding: 10px 15px;
   margin: 10px 0;
 }
-#generation-status .glyphicon {
-  top: 0;
-  font-size : 11px;
-}
 
 .jstree {
 	color : #041922;
diff --git a/webapp/sources/rudder/rudder-web/src/main/webapp/secure/administration/databaseManagement.html b/webapp/sources/rudder/rudder-web/src/main/webapp/secure/administration/databaseManagement.html
index e46dc406cdc..e47bdf72b41 100644
--- a/webapp/sources/rudder/rudder-web/src/main/webapp/secure/administration/databaseManagement.html
+++ b/webapp/sources/rudder/rudder-web/src/main/webapp/secure/administration/databaseManagement.html
@@ -51,7 +51,7 @@ <h3 class="page-title">Active reports
                   </h3>
                   <div class="callout-fade callout-info">
                     <div class="marker">
-                      <span class="glyphicon glyphicon-info-sign"></span>
+                      <span class="fa fa-info-circle"></span>
                     </div>
                     <div>
                       Active reports are stored in an SQL table with full indexing.
@@ -91,7 +91,7 @@ <h3 class="page-title">Active reports
                   <h3 class="page-title">Archived reports</h3>
                   <div class="callout-fade callout-info">
                     <div class="marker">
-                      <span class="glyphicon glyphicon-info-sign"></span>
+                      <span class="fa fa-info-circle"></span>
                     </div>
                     <div>
                       Archived reports are stored in an SQL table without any indexes,
@@ -130,7 +130,7 @@ <h3 class="page-title">Automatic report cleaning</h3>
                   <div class="inner-portlet-content">
                     <div class="callout-fade callout-info">
                       <div class="marker">
-                        <span class="glyphicon glyphicon-info-sign"></span>
+                        <span class="fa fa-info-circle"></span>
                       </div>
                       <div>
                         Regular archiving and deleting of reports can be set in the
@@ -174,7 +174,7 @@ <h3 class="page-title">Manual report cleaning</h3>
                   <div class="inner-portlet-content">
                     <div class="callout-fade callout-info">
                       <div class="marker">
-                        <span class="glyphicon glyphicon-info-sign"></span>
+                        <span class="fa fa-info-circle"></span>
                       </div>
                       <div>
                         You can trigger a reports database cleaning in this section. If a
@@ -209,7 +209,7 @@ <h3 class="page-title">Manual report cleaning</h3>
                           </form>
                           <br/>
                           <div id="cleanResult" style="display:none; float:left" class="callout-fade callout-success">
-                            <div class="marker"><span class="glyphicon glyphicon-ok"></span></div>
+                            <div class="marker"><span class="fa fa-check"></span></div>
                             <span id="cleanResultText"></span>
                           </div>
                         </td>
diff --git a/webapp/sources/rudder/rudder-web/src/main/webapp/secure/administration/policyServerManagement.html b/webapp/sources/rudder/rudder-web/src/main/webapp/secure/administration/policyServerManagement.html
index 586d3030d07..f22c15f3945 100644
--- a/webapp/sources/rudder/rudder-web/src/main/webapp/secure/administration/policyServerManagement.html
+++ b/webapp/sources/rudder/rudder-web/src/main/webapp/secure/administration/policyServerManagement.html
@@ -5,8 +5,6 @@
   <style>
     .template-sidebar.sidebar-left{
       box-shadow : none !important;
-      flex-basis : initial !important;
-      flex: initial !important;
     }
     .template-main{
       flex-basis : initial !important;
diff --git a/webapp/sources/rudder/rudder-web/src/main/webapp/secure/administration/techniqueLibraryManagement.html b/webapp/sources/rudder/rudder-web/src/main/webapp/secure/administration/techniqueLibraryManagement.html
index ff2cdf1702c..867e96b2c82 100644
--- a/webapp/sources/rudder/rudder-web/src/main/webapp/secure/administration/techniqueLibraryManagement.html
+++ b/webapp/sources/rudder/rudder-web/src/main/webapp/secure/administration/techniqueLibraryManagement.html
@@ -12,7 +12,7 @@
       <div class="page-title">Technique library</div>
       <div class="callout-fade callout-info">
         <div class="marker">
-          <span class="glyphicon glyphicon-info-sign"></span>
+          <span class="fa fa-info-circle"></span>
         </div>
         <lift:authz role="directive_read">
           Only techniques in the user library are available to create <a href="/secure/configurationManager/directiveManagement">new directives</a>. Add new techniques by drag'n'dropping them from left to right.
diff --git a/webapp/sources/rudder/rudder-web/src/main/webapp/secure/configurationManager/parameterManagement.html b/webapp/sources/rudder/rudder-web/src/main/webapp/secure/configurationManager/parameterManagement.html
index 68f6da6d4a4..db932f93de1 100644
--- a/webapp/sources/rudder/rudder-web/src/main/webapp/secure/configurationManager/parameterManagement.html
+++ b/webapp/sources/rudder/rudder-web/src/main/webapp/secure/configurationManager/parameterManagement.html
@@ -69,7 +69,7 @@ <h1>
               <lift:authz role="directive_read">
                 <div class="callout-fade callout-info">
                   <div class="marker">
-                    <span class="glyphicon glyphicon-info-sign"></span>
+                    <span class="fa fa-info-circle"></span>
                   </div>
                   <div>
                     <p>
diff --git a/webapp/sources/rudder/rudder-web/src/main/webapp/secure/nodeManager/manageNewNode.html b/webapp/sources/rudder/rudder-web/src/main/webapp/secure/nodeManager/manageNewNode.html
index 21209abd2b5..5aec2e33302 100644
--- a/webapp/sources/rudder/rudder-web/src/main/webapp/secure/nodeManager/manageNewNode.html
+++ b/webapp/sources/rudder/rudder-web/src/main/webapp/secure/nodeManager/manageNewNode.html
@@ -65,10 +65,10 @@ <h1>
                 <div id="review_new_server">
                   <div class="callout-fade callout-info">
                     <div class="marker">
-                      <span class="glyphicon glyphicon-info-sign"></span>
+                      <span class="fa fa-info-circle"></span>
                     </div>
                     <p>Click on a node name to view detailed inventory information.</p>
-                    <p>Click on <i class="glyphicon glyphicon-search"></i>to list Rules that would be applied to this node if you accept it.</p>
+                    <p>Click on <i class="fa fa-search"></i>to list Rules that would be applied to this node if you accept it.</p>
                   </div>
                   <lift:Msgs>[error]</lift:Msgs>
                   <div  data-lift="lazy-load?template=lazy-load-spinner">
@@ -90,7 +90,7 @@ <h1>
                   <div data-lift="lazy-load?template=lazy-load-spinner">
                     <div class="callout-fade callout-info">
                       <div class="marker">
-                        <span class="glyphicon glyphicon-info-sign"></span>
+                        <span class="fa fa-info-circle"></span>
                       </div>
                       <p>View history of Nodes that have been accepted or refused.</p>
                       <p>Click on a node name to view detailed inventory information (as it was at review time).</p>
diff --git a/webapp/sources/rudder/rudder-web/src/main/webapp/secure/utilities/archiveManagement.html b/webapp/sources/rudder/rudder-web/src/main/webapp/secure/utilities/archiveManagement.html
index 0df04043bda..969ea44933a 100644
--- a/webapp/sources/rudder/rudder-web/src/main/webapp/secure/utilities/archiveManagement.html
+++ b/webapp/sources/rudder/rudder-web/src/main/webapp/secure/utilities/archiveManagement.html
@@ -63,7 +63,7 @@ <h3 class="page-title">Global archive</h3>
               <div class="portlet-content">
                 <div class="callout-fade callout-info">
                   <div class="marker">
-                    <span class="glyphicon glyphicon-info-sign"></span>
+                    <span class="fa fa-info-circle"></span>
                   </div>
                   Archive or restore settings (groups, rules, directives and active techniques) from Rudder to backup, restore or transfer items between Rudder instances.
                 </div>
@@ -91,7 +91,7 @@ <h3 class="page-title">Archive groups</h3>
               <div class="portlet-content">
                 <div class="callout-fade callout-info">
                   <div class="marker">
-                    <span class="glyphicon glyphicon-info-sign"></span>
+                    <span class="fa fa-info-circle"></span>
                   </div>
                   <div>Archive or restore groups only.</div>
                 </div>
@@ -119,7 +119,7 @@ <h3 class="page-title">Archive rules</h3>
               <div class="portlet-content">
                 <div class="callout-fade callout-info">
                   <div class="marker">
-                    <span class="glyphicon glyphicon-info-sign"></span>
+                    <span class="fa fa-info-circle"></span>
                   </div>
                   <div>Archive or restore rules only.</div>
                 </div>
@@ -147,7 +147,7 @@ <h3 class="page-title">Archive directives and active techniques</h3>
               <div class="portlet-content">
                 <div class="callout-fade callout-info">
                   <div class="marker">
-                    <span class="glyphicon glyphicon-info-sign"></span>
+                    <span class="fa fa-info-circle"></span>
                   </div>
                   <div>Archive or restore directives and active techniques only.</div>
                 </div>
@@ -175,7 +175,7 @@ <h3 class="page-title">Archive parameters</h3>
               <div class="portlet-content">
                 <div class="callout-fade callout-info">
                   <div class="marker">
-                    <span class="glyphicon glyphicon-info-sign"></span>
+                    <span class="fa fa-info-circle"></span>
                   </div>
                   <div>Archive or restore parameters only.</div>
                 </div>
diff --git a/webapp/sources/rudder/rudder-web/src/main/webapp/templates-hidden/Popup/accept_new_server.html b/webapp/sources/rudder/rudder-web/src/main/webapp/templates-hidden/Popup/accept_new_server.html
index 60ae96603ed..320f99f74ed 100644
--- a/webapp/sources/rudder/rudder-web/src/main/webapp/templates-hidden/Popup/accept_new_server.html
+++ b/webapp/sources/rudder/rudder-web/src/main/webapp/templates-hidden/Popup/accept_new_server.html
@@ -31,7 +31,7 @@ <h6 class="text-center">
                     </table>
                 </div>
                 <div class="alert alert-info text-center" role="alert">
-                    <span aria-hidden="true" class="glyphicon glyphicon-info-sign"></span>
+                    <span aria-hidden="true" class="fa fa-info-circle"></span>
                     <span>
                         When these nodes join Rudder, the Rules they will have to comply to will be transferred to them.
                     </span>
diff --git a/webapp/sources/rudder/rudder-web/src/main/webapp/templates-hidden/Popup/expected_policy_popup.html b/webapp/sources/rudder/rudder-web/src/main/webapp/templates-hidden/Popup/expected_policy_popup.html
index 0df2dd6b5ac..39f9ce6c9b5 100644
--- a/webapp/sources/rudder/rudder-web/src/main/webapp/templates-hidden/Popup/expected_policy_popup.html
+++ b/webapp/sources/rudder/rudder-web/src/main/webapp/templates-hidden/Popup/expected_policy_popup.html
@@ -16,7 +16,7 @@ <h5 class="modal-title">Rules to be applied</h5>
                 <div class="modal-body">
                      <h4 class="text-center">The following Rules will be applied to this node as it joins Rudder, based on criteria from dynamic groups it would become a member of.</h4>
                     <div class="alert alert-info text-center space-top">
-                        <span class="glyphicon glyphicon-info-sign"></span>
+                        <span class="fa fa-info-circle"></span>
                         Some additional rules may be applied to this node when additional node information is detected during the daily inventory.
                     </div>
                 <br/>
diff --git a/webapp/sources/rudder/rudder-web/src/main/webapp/templates-hidden/Popup/refuse_new_server.html b/webapp/sources/rudder/rudder-web/src/main/webapp/templates-hidden/Popup/refuse_new_server.html
index c49759e98f5..1fc0c59b65b 100644
--- a/webapp/sources/rudder/rudder-web/src/main/webapp/templates-hidden/Popup/refuse_new_server.html
+++ b/webapp/sources/rudder/rudder-web/src/main/webapp/templates-hidden/Popup/refuse_new_server.html
@@ -31,7 +31,7 @@ <h6 class="text-center">
                     </table>
                 </div>
                 <div class="alert alert-warning text-center" role="alert">
-                    <span aria-hidden="true" class="glyphicon glyphicon-exclamation-sign"></span>
+                    <span aria-hidden="true" class="fa fa-exclamation-triangle"></span>
                     <span>
                         This action will delete the latest inventory data that has been sent to
                         Rudder by these nodes.
diff --git a/webapp/sources/rudder/rudder-web/src/main/webapp/templates-hidden/components/ComponentDirectiveEditForm.html b/webapp/sources/rudder/rudder-web/src/main/webapp/templates-hidden/components/ComponentDirectiveEditForm.html
index 8ebc6468620..41e362eba93 100644
--- a/webapp/sources/rudder/rudder-web/src/main/webapp/templates-hidden/components/ComponentDirectiveEditForm.html
+++ b/webapp/sources/rudder/rudder-web/src/main/webapp/templates-hidden/components/ComponentDirectiveEditForm.html
@@ -103,7 +103,7 @@ <h1>
       <lift:authz role="directive_edit">
         <div class="explanation-text" id="pendingChangeRequestNotification">
           <div class="marker">
-            <span class="glyphicon glyphicon-info-sign"></span>
+            <span class="fa fa-info-circle"></span>
           </div>
           <h4>Pending change requests</h4>
           <p>
@@ -197,7 +197,7 @@ <h4>Pending change requests</h4>
             <div class="col-xs-12 col-sm-6 col-lg-5">
               <div class="callout-fade callout-warning" id="deprecation-warning" role="alert">
                 <div class="marker">
-                  <span class="glyphicon glyphicon-info-sign"></span>
+                  <span class="fa fa-info-circle"></span>
                 </div>
                 <h4>Technique version deprecated</h4>
                 <div>This Directive uses a version of this Technique that is deprecated: <span id="deprecation-message"></span>.<br/>
diff --git a/webapp/sources/rudder/rudder-web/src/main/webapp/templates-hidden/components/ComponentTechniqueEditForm.html b/webapp/sources/rudder/rudder-web/src/main/webapp/templates-hidden/components/ComponentTechniqueEditForm.html
index 49bc625e257..26fd552875d 100644
--- a/webapp/sources/rudder/rudder-web/src/main/webapp/templates-hidden/components/ComponentTechniqueEditForm.html
+++ b/webapp/sources/rudder/rudder-web/src/main/webapp/templates-hidden/components/ComponentTechniqueEditForm.html
@@ -109,7 +109,7 @@ <h4 class="text-center">
                             [Here comes the tree of Directives / Rules that will be removed]
                         </div>
                         <div class="alert alert-warning col-lg-12 col-sm-12 col-xs-12 text-center space-bottom" role="alert">
-                            <span class="glyphicon glyphicon-exclamation-sign" aria-hidden="true"></span>
+                            <span class="fa fa-exclamation-triangle" aria-hidden="true"></span>
                             <span class="visually-hidden">Warning:</span>
                             Deleting this Technique will also delete its history and compliance reports,
                             and the Directives and Rules above.
@@ -159,7 +159,7 @@ <h4 class="text-center">
                         [Here comes the tree of Directives / Rules that will be removed]
                     </div>
                     <div class="alert alert-warning col-lg-12 col-sm-12 col-xs-12 text-center space-bottom" role="alert">
-                        <span class="glyphicon glyphicon-exclamation-sign" aria-hidden="true"></span>
+                        <span class="fa fa-exclamation-triangle" aria-hidden="true"></span>
                         <span class="visually-hidden">Warning:</span>
                         Enabling/Disabling this Technique will affect the Directives and Rules above.
                     </div>
diff --git a/webapp/sources/rudder/rudder-web/src/main/webapp/templates-hidden/components/directiveInput.html b/webapp/sources/rudder/rudder-web/src/main/webapp/templates-hidden/components/directiveInput.html
index 3a5d427241f..58864ca62d1 100644
--- a/webapp/sources/rudder/rudder-web/src/main/webapp/templates-hidden/components/directiveInput.html
+++ b/webapp/sources/rudder/rudder-web/src/main/webapp/templates-hidden/components/directiveInput.html
@@ -35,7 +35,7 @@
     <div class="input-group col-xs-12 rect-padding">
       <span class="input-group-btn">
         <button class="btn btn-default btn-sm browserFile" type="button" id="browserFile" onclick="">
-          <span class="glyphicon glyphicon-folder-open"></span>
+          <span class="fa fa-folder-open"></span>
         </button>
       </span>
     </div>
diff --git a/webapp/sources/rudder/rudder-web/src/main/webapp/templates-hidden/components/passwordInput.html b/webapp/sources/rudder/rudder-web/src/main/webapp/templates-hidden/components/passwordInput.html
index c26ae69f2ac..20b864b996b 100644
--- a/webapp/sources/rudder/rudder-web/src/main/webapp/templates-hidden/components/passwordInput.html
+++ b/webapp/sources/rudder/rudder-web/src/main/webapp/templates-hidden/components/passwordInput.html
@@ -13,7 +13,7 @@
               </button>
               <ul class="dropdown-menu"></ul>
               <button type="button" data-reveal="current" class="btn btn-default reveal-password">
-                <span class="glyphicon glyphicon-eye-open"></span>
+                <span class="fa fa-eye"></span>
               </button>
               <button type="button" class="btn btn-info"    data-action="change" >Change</button>
               <button type="button" class="btn btn-success" data-action="keep"   >Revert</button>
@@ -66,7 +66,7 @@ <h4>Password will not be managed by Rudder anymore
                 <input type="text" class="form-control input-new-passwd"/>
                 <span class="input-group-btn">
                 <button type="button" data-reveal="new" class="btn btn-default reveal-password">
-                  <span class="glyphicon glyphicon-eye-open"></span>
+                  <span class="fa fa-eye"></span>
                 </button>
               </span>
               </div>
@@ -90,7 +90,7 @@ <h4>Password will not be managed by Rudder anymore
               <input type="text" class="form-control input-new-passwd"/>
               <span class="input-group-btn cleartext-reveal">
                 <button type="button" data-reveal="new" class="btn btn-default reveal-password">
-                  <span class="glyphicon glyphicon-eye-open"></span>
+                  <span class="fa fa-eye"></span>
                 </button>
               </span>
             </div>