diff --git a/R/fab_button.R b/R/fab_button.R
index d23e1fc..8880a11 100644
--- a/R/fab_button.R
+++ b/R/fab_button.R
@@ -54,7 +54,7 @@ fab_button <- function(...,
           `data-mfb-label` = label,
           class = "mfb-component__button--main action-button",
           icon("plus", class = "mfb-component__main-icon--resting"),
-          icon("times", class = "mfb-component__main-icon--active")
+          icon("xmark", class = "mfb-component__main-icon--active")
         ),
         tags$ul(
           class = "mfb-component__list",
diff --git a/R/module-admin.R b/R/module-admin.R
index beac304..945536f 100644
--- a/R/module-admin.R
+++ b/R/module-admin.R
@@ -44,7 +44,7 @@ admin_ui <- function(id, lan = NULL) {
           label = "",
           class = "btn-secondary pull-right",
           style = "margin-left: 5px",
-          icon = icon("check-square")
+          icon = icon("square-check")
         ),
         
         actionButton(
@@ -52,14 +52,14 @@ admin_ui <- function(id, lan = NULL) {
           label = lan$get("Edit selected users"),
           class = "btn-primary pull-right disabled",
           style = "margin-left: 5px",
-          icon = icon("edit")
+          icon = icon("pen-to-square")
         ),
         
         actionButton(
           inputId = ns("remove_selected_users"),
           label = lan$get("Remove selected users"),
           class = "btn-danger pull-right disabled",
-          icon = icon("trash-alt")
+          icon = icon("trash-can")
         ),
         
         tags$br(),
@@ -90,7 +90,7 @@ admin_ui <- function(id, lan = NULL) {
           label = "",
           class = "btn-secondary pull-right",
           style = "margin-left: 5px",
-          icon = icon("check-square")
+          icon = icon("square-check")
         ),
         
         actionButton(
@@ -194,8 +194,8 @@ admin <- function(input, output, session, sqlite_path, passphrase, lan,
     
     users <- users()
     users <- users[, setdiff(names(users), c("password", "is_hashed_password")), drop = FALSE]
-    users$Edit <- input_btns(ns("edit_user"), users$user, "Edit user", icon("edit"), status = "primary", lan = lan())
-    users$Remove <- input_btns(ns("remove_user"), users$user, "Delete user", icon("trash-alt"), status = "danger", lan = lan())
+    users$Edit <- input_btns(ns("edit_user"), users$user, "Edit user", icon("pen-to-square"), status = "primary", lan = lan())
+    users$Remove <- input_btns(ns("remove_user"), users$user, "Delete user", icon("trash-can"), status = "danger", lan = lan())
     users$Select <- input_checkbox_ui(ns("select_mult_users"), users$user, session = session)
     names_lan <- sapply(names(users), function(x) lan()$get(x))
     change <- as.logical(users$admin)
@@ -257,7 +257,7 @@ admin <- function(input, output, session, sqlite_path, passphrase, lan,
     }
     
     pwds$`Change password` <- input_btns(ns("change_pwd"), pwds$user, "Ask to change password", icon("key"), status = "primary", lan = lan())
-    pwds$`Reset password` <- input_btns(ns("reset_pwd"), pwds$user, "Reset password", icon("undo"), status = "warning", lan = lan())
+    pwds$`Reset password` <- input_btns(ns("reset_pwd"), pwds$user, "Reset password", icon("arrow-rotate-left"), status = "warning", lan = lan())
     pwds$Select <- input_checkbox_ui(ns("change_mult_pwds"), pwds$user, session = session)
     names_lan <- sapply(names(pwds), function(x) lan()$get(x))
     change <- as.logical(pwds$must_change)
@@ -398,7 +398,7 @@ admin <- function(input, output, session, sqlite_path, passphrase, lan,
         ui = tags$div(
           id = ns("alert-edituser-exist"),
           class = "alert alert-warning",
-          icon("exclamation-triangle"),
+          icon("triangle-exclamation"),
           lan()$get("User already exist!")
         ),
         immediate = TRUE
@@ -521,7 +521,7 @@ admin <- function(input, output, session, sqlite_path, passphrase, lan,
         ui = tags$div(
           id = ns("alert-user-exist"),
           class = "alert alert-warning",
-          icon("exclamation-triangle"),
+          icon("triangle-exclamation"),
           lan()$get("User already exist!")
         ),
         immediate = TRUE
diff --git a/R/module-auth.R b/R/module-auth.R
index 782b2d6..c55f92a 100644
--- a/R/module-auth.R
+++ b/R/module-auth.R
@@ -261,7 +261,7 @@ auth_server <- function(input, output, session,
         selector = jns("result_auth"),
         ui = tags$div(
           id = ns("msg_auth"), class = "alert alert-danger",
-          icon("exclamation-triangle"), lan()$get("Your account is locked")
+          icon("triangle-exclamation"), lan()$get("Your account is locked")
         )
       )
       
@@ -272,7 +272,7 @@ auth_server <- function(input, output, session,
           selector = jns("result_auth"),
           ui = tags$div(
             id = ns("msg_auth"), class = "alert alert-danger",
-            icon("exclamation-triangle"), lan()$get("Username or password are incorrect")
+            icon("triangle-exclamation"), lan()$get("Username or password are incorrect")
           )
         )
       } else if (isTRUE(res_auth$expired)) {
@@ -281,7 +281,7 @@ auth_server <- function(input, output, session,
           selector = jns("result_auth"),
           ui = tags$div(
             id = ns("msg_auth"), class = "alert alert-danger",
-            icon("exclamation-triangle"), lan()$get("Your account has expired")
+            icon("triangle-exclamation"), lan()$get("Your account has expired")
           )
         )
       } else {
@@ -291,7 +291,7 @@ auth_server <- function(input, output, session,
             selector = jns("result_auth"),
             ui = tags$div(
               id = ns("msg_auth"), class = "alert alert-danger",
-              icon("exclamation-triangle"), lan()$get("You are not authorized for this application")
+              icon("triangle-exclamation"), lan()$get("You are not authorized for this application")
             )
           )
         } else {
@@ -303,7 +303,7 @@ auth_server <- function(input, output, session,
               selector = jns("result_auth"),
               ui = tags$div(
                 id = ns("msg_auth"), class = "alert alert-danger",
-                icon("exclamation-triangle"), lan()$get("Username or password are incorrect")
+                icon("triangle-exclamation"), lan()$get("Username or password are incorrect")
               )
             )
           } else {
@@ -311,7 +311,7 @@ auth_server <- function(input, output, session,
               selector = jns("result_auth"),
               ui = tags$div(
                 id = ns("msg_auth"), class = "alert alert-danger",
-                icon("exclamation-triangle"), lan()$get("Your account is locked")
+                icon("triangle-exclamation"), lan()$get("Your account is locked")
               )
             )
           }
diff --git a/R/module-pwd.R b/R/module-pwd.R
index d1d796e..dc4d11c 100644
--- a/R/module-pwd.R
+++ b/R/module-pwd.R
@@ -56,7 +56,7 @@ pwd_ui <- function(id, tag_img = NULL, status = "primary", lan = NULL) {
               ),
               tags$span(
                 class = "help-block",
-                icon("info-circle"),
+                icon("circle-info"),
                 lan$get("Password must contain at least one number, one lowercase, one uppercase and must be at least length 6.")
               ),
               tags$br(),
@@ -133,7 +133,7 @@ pwd_server <- function(input, output, session, user, update_pwd, validate_pwd =
         selector = jns("result_pwd"),
         ui = tags$div(
           id = ns("msg_pwd"), class = "alert alert-danger",
-          icon("exclamation-triangle"), lan()$get("The two passwords are different")
+          icon("triangle-exclamation"), lan()$get("The two passwords are different")
         )
       )
     } else if (!check_new_pwd(user$user, input$pwd_one)) {
@@ -141,7 +141,7 @@ pwd_server <- function(input, output, session, user, update_pwd, validate_pwd =
         selector = jns("result_pwd"),
         ui = tags$div(
           id = ns("msg_pwd"), class = "alert alert-danger",
-          icon("exclamation-triangle"), lan()$get("New password cannot be the same as old")
+          icon("triangle-exclamation"), lan()$get("New password cannot be the same as old")
         )
       )
     } else {
@@ -150,7 +150,7 @@ pwd_server <- function(input, output, session, user, update_pwd, validate_pwd =
           selector = jns("result_pwd"),
           ui = tags$div(
             id = ns("msg_pwd"), class = "alert alert-danger",
-            icon("exclamation-triangle"), lan()$get("Password does not respect safety requirements")
+            icon("triangle-exclamation"), lan()$get("Password does not respect safety requirements")
           )
         )
       } else {
@@ -179,7 +179,7 @@ pwd_server <- function(input, output, session, user, update_pwd, validate_pwd =
             selector = jns("result_pwd"),
             ui = tags$div(
               id = ns("msg_pwd"), class = "alert alert-danger",
-              icon("exclamation-triangle"), lan()$get("Failed to update password")
+              icon("triangle-exclamation"), lan()$get("Failed to update password")
             )
           )
         }
diff --git a/R/secure-app.R b/R/secure-app.R
index f95d657..657cc05 100644
--- a/R/secure-app.R
+++ b/R/secure-app.R
@@ -80,7 +80,7 @@ secure_app <- function(ui,
               actionButton(
                 inputId = ".shinymanager_logout",
                 label = lan$get("Logout"),
-                icon = icon("sign-out-alt")
+                icon = icon("right-from-bracket")
               ),
               actionButton(
                 inputId = ".shinymanager_app",
@@ -91,7 +91,7 @@ secure_app <- function(ui,
             shinymanager_where("admin")
           ),
           tabPanel(
-            title = tagList(icon("home"), lan$get("Home")),
+            title = tagList(icon("house"), lan$get("Home")),
             value = "home",
             admin_ui("admin", lan),
             shinymanager_language(lan$get_language())
@@ -109,12 +109,12 @@ secure_app <- function(ui,
             actionButton(
               inputId = ".shinymanager_logout",
               label = lan$get("Logout"),
-              icon = icon("sign-out-alt")
+              icon = icon("right-from-bracket")
             ),
             actionButton(
               inputId = ".shinymanager_admin",
               label = lan$get("Administrator mode"),
-              icon = icon("cogs")
+              icon = icon("gears")
             )
           )
         } else {
@@ -126,7 +126,7 @@ secure_app <- function(ui,
             actionButton(
               inputId = ".shinymanager_logout",
               label = lan$get("Logout"),
-              icon = icon("sign-out-alt")
+              icon = icon("right-from-bracket")
             )
           )
         }
diff --git a/dev/shiny-classic-sqlite-bookmark/global.R b/dev/shiny-classic-sqlite-bookmark/global.R
index 69d6cc8..cc9fe0b 100644
--- a/dev/shiny-classic-sqlite-bookmark/global.R
+++ b/dev/shiny-classic-sqlite-bookmark/global.R
@@ -21,4 +21,4 @@ credentials <- data.frame(
 
 #conn <- DBI::dbConnect(RSQLite::SQLite(), dbname = "dev/shiny-classic-sqlite/credentials.sqlite")
 #read_db_decrypt(conn, passphrase = "supersecret")
-#DBI::dbDisconnect(conn)
\ No newline at end of file
+#DBI::dbDisconnect(conn)
diff --git a/dev/shiny-classic-sqlite/global.R b/dev/shiny-classic-sqlite/global.R
index 69d6cc8..cc9fe0b 100644
--- a/dev/shiny-classic-sqlite/global.R
+++ b/dev/shiny-classic-sqlite/global.R
@@ -21,4 +21,4 @@ credentials <- data.frame(
 
 #conn <- DBI::dbConnect(RSQLite::SQLite(), dbname = "dev/shiny-classic-sqlite/credentials.sqlite")
 #read_db_decrypt(conn, passphrase = "supersecret")
-#DBI::dbDisconnect(conn)
\ No newline at end of file
+#DBI::dbDisconnect(conn)
diff --git a/dev/shinydashboard/ui.R b/dev/shinydashboard/ui.R
index 1ce39ed..dafe3be 100644
--- a/dev/shinydashboard/ui.R
+++ b/dev/shinydashboard/ui.R
@@ -9,7 +9,7 @@ ui <- dashboardPage(
   dashboardSidebar(
     sidebarMenu(
       menuItem("Dashboard", tabName = "dashboard", icon = icon("dashboard")),
-      menuItem("Widgets", tabName = "widgets", icon = icon("th"))
+      menuItem("Widgets", tabName = "widgets", icon = icon("table-cells"))
     )
   ),
 
diff --git a/examples/fab_button.R b/examples/fab_button.R
index ddf81a2..e150812 100644
--- a/examples/fab_button.R
+++ b/examples/fab_button.R
@@ -18,7 +18,7 @@ ui <- fluidPage(
     actionButton(
       inputId = "logout",
       label = "Logout",
-      icon = icon("sign-out")
+      icon = icon("arrow-right-from-bracket")
     ),
     actionButton(
       inputId = "info",
diff --git a/inst/demo_app/global.R b/inst/demo_app/global.R
index 5e7cc2f..e04b86f 100644
--- a/inst/demo_app/global.R
+++ b/inst/demo_app/global.R
@@ -17,4 +17,4 @@ create_db(
   credentials_data = credentials,
   sqlite_path = "database.sqlite", # elle sera crée
   passphrase = "passphrase_wihtout_keyring"
-)
\ No newline at end of file
+)
diff --git a/inst/demo_app/ui.R b/inst/demo_app/ui.R
index 4de0655..6bfddbb 100644
--- a/inst/demo_app/ui.R
+++ b/inst/demo_app/ui.R
@@ -71,4 +71,4 @@ secure_app(ui,
            # ui background ?
            # https://developer.mozilla.org/fr/docs/Web/CSS/background
            background  = "center/20% url('figures/shinymanager.png');"
-)
\ No newline at end of file
+)
diff --git a/tests/testthat/test-credentials-db.R b/tests/testthat/test-credentials-db.R
index 84be931..05a24f1 100644
--- a/tests/testthat/test-credentials-db.R
+++ b/tests/testthat/test-credentials-db.R
@@ -23,4 +23,4 @@ test_that("read_db_decrypt works", {
 
 test_that("create_db duplicated users", {
   expect_error(create_db(credentials_data = rbind(credentials, credentials), sqlite_path = tmp_sqlite_error, passphrase = "secret"))
-})
\ No newline at end of file
+})
diff --git a/tests/testthat/test-language.R b/tests/testthat/test-language.R
index 5fa9477..6a160c6 100644
--- a/tests/testthat/test-language.R
+++ b/tests/testthat/test-language.R
@@ -26,4 +26,4 @@ test_that("other language", {
   expect_true(length(l_all) > 0)
   
   expect_error(lan_fr$set_language("bad"))
-})
\ No newline at end of file
+})
diff --git a/tests/testthat/test-tokens.R b/tests/testthat/test-tokens.R
index 18d3357..8bae0d8 100644
--- a/tests/testthat/test-tokens.R
+++ b/tests/testthat/test-tokens.R
@@ -76,4 +76,4 @@ test_that("token remove", {
   expect_true(.tok$is_valid_server(token_not_admin))
   expect_silent(.tok$remove(token_not_admin))
   expect_false(.tok$is_valid_server(token_not_admin))
-})
\ No newline at end of file
+})