diff --git a/generators/client/templates/angular/src/main/webapp/404.html.ejs b/generators/client/templates/angular/src/main/webapp/404.html.ejs
index 2ff56fc91bd6..95fcdda3b28a 100644
--- a/generators/client/templates/angular/src/main/webapp/404.html.ejs
+++ b/generators/client/templates/angular/src/main/webapp/404.html.ejs
@@ -22,7 +22,7 @@
     <meta charset="utf-8">
     <title>Page Not Found</title>
     <meta name="viewport" content="width=device-width, initial-scale=1">
-    <link rel="shortcut icon" href="favicon.ico" />
+    <link rel="icon" href="favicon.ico" />
     <style>
 
         * {
diff --git a/generators/client/templates/angular/src/main/webapp/index.html.ejs b/generators/client/templates/angular/src/main/webapp/index.html.ejs
index 0e16fbe9f51f..35a0b3f75cb9 100644
--- a/generators/client/templates/angular/src/main/webapp/index.html.ejs
+++ b/generators/client/templates/angular/src/main/webapp/index.html.ejs
@@ -27,7 +27,7 @@
     <meta name="google" content="notranslate"><% } %>
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
     <meta name="theme-color" content="#000000">
-    <link rel="shortcut icon" href="favicon.ico" />
+    <link rel="icon" href="favicon.ico" />
     <link rel="manifest" href="manifest.webapp" />
     <link rel="stylesheet" href="content/css/loading.css">
     <!-- jhipster-needle-add-resources-to-root - JHipster will add new resources here -->
diff --git a/generators/client/templates/react/src/main/webapp/404.html.ejs b/generators/client/templates/react/src/main/webapp/404.html.ejs
index 2ff56fc91bd6..95fcdda3b28a 100644
--- a/generators/client/templates/react/src/main/webapp/404.html.ejs
+++ b/generators/client/templates/react/src/main/webapp/404.html.ejs
@@ -22,7 +22,7 @@
     <meta charset="utf-8">
     <title>Page Not Found</title>
     <meta name="viewport" content="width=device-width, initial-scale=1">
-    <link rel="shortcut icon" href="favicon.ico" />
+    <link rel="icon" href="favicon.ico" />
     <style>
 
         * {
diff --git a/generators/client/templates/react/src/main/webapp/index.html.ejs b/generators/client/templates/react/src/main/webapp/index.html.ejs
index 0fb61e97880e..c9d444947a65 100644
--- a/generators/client/templates/react/src/main/webapp/index.html.ejs
+++ b/generators/client/templates/react/src/main/webapp/index.html.ejs
@@ -27,7 +27,7 @@
     <meta name="google" content="notranslate"><% } %>
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
     <meta name="theme-color" content="#000000">
-    <link rel="shortcut icon" href="favicon.ico" />
+    <link rel="icon" href="favicon.ico" />
     <link rel="manifest" href="manifest.webapp" />
     <link rel="stylesheet" href="content/css/loading.css">
     <!-- jhipster-needle-add-resources-to-root - JHipster will add new resources here -->
diff --git a/generators/server/templates/src/main/resources/templates/error.html.ejs b/generators/server/templates/src/main/resources/templates/error.html.ejs
index b70348866f79..a421bd26bead 100644
--- a/generators/server/templates/src/main/resources/templates/error.html.ejs
+++ b/generators/server/templates/src/main/resources/templates/error.html.ejs
@@ -3,7 +3,7 @@
       xsi:schemaLocation="http://www.thymeleaf.org" th:lang="${#locale.language}" lang="en">
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-    <link rel="shortcut icon" href="${baseUrl}/favicon.ico" />
+    <link rel="icon" href="${baseUrl}/favicon.ico" />
     <title>Your request cannot be processed</title>
     <style>
         ::-moz-selection {
diff --git a/generators/server/templates/src/main/resources/templates/mail/activationEmail.html.ejs b/generators/server/templates/src/main/resources/templates/mail/activationEmail.html.ejs
index f88aa9449bca..07d8d3b13b75 100644
--- a/generators/server/templates/src/main/resources/templates/mail/activationEmail.html.ejs
+++ b/generators/server/templates/src/main/resources/templates/mail/activationEmail.html.ejs
@@ -3,7 +3,7 @@
     <head>
         <title th:text="#{email.activation.title}">JHipster activation</title>
         <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-        <link rel="shortcut icon" th:href="@{|${baseUrl}/favicon.ico|}" />
+        <link rel="icon" th:href="@{|${baseUrl}/favicon.ico|}" />
     </head>
     <body>
         <p th:text="#{email.activation.greeting(${user.login})}">
diff --git a/generators/server/templates/src/main/resources/templates/mail/creationEmail.html.ejs b/generators/server/templates/src/main/resources/templates/mail/creationEmail.html.ejs
index 26d3fe4647d0..1d9276e3fce9 100644
--- a/generators/server/templates/src/main/resources/templates/mail/creationEmail.html.ejs
+++ b/generators/server/templates/src/main/resources/templates/mail/creationEmail.html.ejs
@@ -3,7 +3,7 @@
     <head>
         <title th:text="#{email.activation.title}">JHipster creation</title>
         <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-        <link rel="shortcut icon" th:href="@{|${baseUrl}/favicon.ico|}" />
+        <link rel="icon" th:href="@{|${baseUrl}/favicon.ico|}" />
     </head>
     <body>
         <p th:text="#{email.activation.greeting(${user.login})}">
diff --git a/generators/server/templates/src/main/resources/templates/mail/passwordResetEmail.html.ejs b/generators/server/templates/src/main/resources/templates/mail/passwordResetEmail.html.ejs
index c5ae07fb71bb..4e709cf05af9 100644
--- a/generators/server/templates/src/main/resources/templates/mail/passwordResetEmail.html.ejs
+++ b/generators/server/templates/src/main/resources/templates/mail/passwordResetEmail.html.ejs
@@ -3,7 +3,7 @@
     <head>
         <title th:text="#{email.reset.title}">JHipster password reset</title>
         <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-        <link rel="shortcut icon" th:href="@{|${baseUrl}/favicon.ico|}" />
+        <link rel="icon" th:href="@{|${baseUrl}/favicon.ico|}" />
     </head>
     <body>
         <p th:text="#{email.reset.greeting(${user.login})}">
