diff --git a/epistola.cls b/epistola.cls
index b1da9f4..b4ac9af 100644
--- a/epistola.cls
+++ b/epistola.cls
@@ -34,8 +34,9 @@
 % =======================================
 % PACKAGES
 % =======================================
+\RequirePackage{fontspec}
 \RequirePackage{nag}
-\RequirePackage{fontawesome}
+\RequirePackage[fixed]{fontawesome5}
 \RequirePackage{eurosym}
 \RequirePackage{numprint}
 \RequirePackage{microtype}
@@ -62,7 +63,6 @@
 % -- FONTS --
 \defaultfontfeatures{Ligatures=TeX}
 \setmainfont{Linux Biolinum O}
-\newfontfamily{\FA}{[FontAwesome.otf]}
 
 % -- LAYOUT --
 \if@french
@@ -81,7 +81,7 @@
 		\nofax
 		\pagestyle{empty}
 		\renewcommand{\tellabelname}{\faPhone~~~}
-		\renewcommand{\emaillabelname}{\faEnvelopeO~~}
+		\renewcommand{\emaillabelname}{\faEnvelope[regular]~~}
 		
 		% Left margin
 		\marge{0mm}                   % Default: 15mm
@@ -222,7 +222,7 @@
 				\else
 					\\
 				\fi
-				\faEnvelopeO~~{\ttfamily#1}\\[0.5em]
+				\faEnvelope[regular]~~{\ttfamily#1}\\[0.5em]
 			}
 		\fi
 	}
diff --git a/template-english/template-english.pdf b/template-english/template-english.pdf
index 477a23d..22b6195 100644
Binary files a/template-english/template-english.pdf and b/template-english/template-english.pdf differ
diff --git a/template-english/template-english.png b/template-english/template-english.png
index cf95e0b..35e99e6 100644
Binary files a/template-english/template-english.png and b/template-english/template-english.png differ
diff --git a/template-french/template-french.pdf b/template-french/template-french.pdf
index d8c0c58..7de56d1 100644
Binary files a/template-french/template-french.pdf and b/template-french/template-french.pdf differ
diff --git a/template-french/template-french.png b/template-french/template-french.png
index 48d36d3..a2e3aa0 100644
Binary files a/template-french/template-french.png and b/template-french/template-french.png differ