diff --git a/tests/testdata/test_generate_latex_file/classic_empty.tex b/tests/testdata/test_generate_latex_file/classic_empty.tex
index 8463d07c..d54695eb 100644
--- a/tests/testdata/test_generate_latex_file/classic_empty.tex
+++ b/tests/testdata/test_generate_latex_file/classic_empty.tex
@@ -41,6 +41,8 @@
 \ifPDFTeX
     \input{glyphtounicode}
     \pdfgentounicode=1
+    \usepackage[T1]{fontenc}
+    \usepackage[utf8]{inputenc}
 \fi
 
 % Some settings:
diff --git a/tests/testdata/test_generate_latex_file/classic_filled.tex b/tests/testdata/test_generate_latex_file/classic_filled.tex
index ed7839a3..c00c35e8 100644
--- a/tests/testdata/test_generate_latex_file/classic_filled.tex
+++ b/tests/testdata/test_generate_latex_file/classic_filled.tex
@@ -41,6 +41,8 @@
 \ifPDFTeX
     \input{glyphtounicode}
     \pdfgentounicode=1
+    \usepackage[T1]{fontenc}
+    \usepackage[utf8]{inputenc}
 \fi
 
 % Some settings:
@@ -162,45 +164,25 @@
         \vspace{0.3 cm}
 
         \normalsize
-        \mbox{
-            {\footnotesize\faMapMarker*}\hspace*{0.13cm}Istanbul, Turkey
-        }
+        \mbox{{\footnotesize\faMapMarker*}\hspace*{0.13cm}Istanbul, Turkey}
         \kern 0.5 cm
-        \mbox{
-            \hrefWithoutArrow{mailto:johndoe@example.com}{{\footnotesize\faEnvelope[regular]}\hspace*{0.13cm}johndoe@example.com}
-        }
+        \mbox{\hrefWithoutArrow{mailto:johndoe@example.com}{{\footnotesize\faEnvelope[regular]}\hspace*{0.13cm}johndoe@example.com}}
         \kern 0.5 cm
-        \mbox{
-            \hrefWithoutArrow{tel:+90-541-999-99-99}{{\footnotesize\faPhone*}\hspace*{0.13cm}+90 541 999 99 99}
-        }
+        \mbox{\hrefWithoutArrow{tel:+90-541-999-99-99}{{\footnotesize\faPhone*}\hspace*{0.13cm}+90 541 999 99 99}}
         \kern 0.5 cm
-        \mbox{
-            \hrefWithoutArrow{https://example.com/}{{\footnotesize\faLink}\hspace*{0.13cm}example.com}
-        }
+        \mbox{\hrefWithoutArrow{https://example.com/}{{\footnotesize\faLink}\hspace*{0.13cm}example.com}}
         \kern 0.5 cm
-        \mbox{
-            \hrefWithoutArrow{https://linkedin.com/in/johndoe}{{\footnotesize\faLinkedinIn}\hspace*{0.13cm}johndoe}
-        }
+        \mbox{\hrefWithoutArrow{https://linkedin.com/in/johndoe}{{\footnotesize\faLinkedinIn}\hspace*{0.13cm}johndoe}}
         \kern 0.5 cm
-        \mbox{
-            \hrefWithoutArrow{https://github.com/johndoe}{{\footnotesize\faGithub}\hspace*{0.13cm}johndoe}
-        }
+        \mbox{\hrefWithoutArrow{https://github.com/johndoe}{{\footnotesize\faGithub}\hspace*{0.13cm}johndoe}}
         \kern 0.5 cm
-        \mbox{
-            \hrefWithoutArrow{https://instagram.com/johndoe}{{\footnotesize\faInstagram}\hspace*{0.13cm}johndoe}
-        }
+        \mbox{\hrefWithoutArrow{https://instagram.com/johndoe}{{\footnotesize\faInstagram}\hspace*{0.13cm}johndoe}}
         \kern 0.5 cm
-        \mbox{
-            \hrefWithoutArrow{https://orcid.org/0000-0000-0000-0000}{{\footnotesize\faOrcid}\hspace*{0.13cm}0000-0000-0000-0000}
-        }
+        \mbox{\hrefWithoutArrow{https://orcid.org/0000-0000-0000-0000}{{\footnotesize\faOrcid}\hspace*{0.13cm}0000-0000-0000-0000}}
         \kern 0.5 cm
-        \mbox{
-            \hrefWithoutArrow{https://example/@johndoe}{{\footnotesize\faMastodon}\hspace*{0.13cm}@johndoe@example}
-        }
+        \mbox{\hrefWithoutArrow{https://example/@johndoe}{{\footnotesize\faMastodon}\hspace*{0.13cm}@johndoe@example}}
         \kern 0.5 cm
-        \mbox{
-            \hrefWithoutArrow{https://twitter.com/johndoe}{{\footnotesize\faTwitter}\hspace*{0.13cm}johndoe}
-        }
+        \mbox{\hrefWithoutArrow{https://twitter.com/johndoe}{{\footnotesize\faTwitter}\hspace*{0.13cm}johndoe}}
         \kern 0.5 cm
     \end{header}
 
diff --git a/tests/testdata/test_generate_latex_file/engineeringresumes_empty.tex b/tests/testdata/test_generate_latex_file/engineeringresumes_empty.tex
index efb06bc4..8228a48f 100644
--- a/tests/testdata/test_generate_latex_file/engineeringresumes_empty.tex
+++ b/tests/testdata/test_generate_latex_file/engineeringresumes_empty.tex
@@ -41,6 +41,8 @@
 \ifPDFTeX
     \input{glyphtounicode}
     \pdfgentounicode=1
+    \usepackage[T1]{fontenc}
+    \usepackage[utf8]{inputenc}
 \fi
 
 % Some settings:
diff --git a/tests/testdata/test_generate_latex_file/engineeringresumes_filled.tex b/tests/testdata/test_generate_latex_file/engineeringresumes_filled.tex
index c1111236..def528b9 100644
--- a/tests/testdata/test_generate_latex_file/engineeringresumes_filled.tex
+++ b/tests/testdata/test_generate_latex_file/engineeringresumes_filled.tex
@@ -41,6 +41,8 @@
 \ifPDFTeX
     \input{glyphtounicode}
     \pdfgentounicode=1
+    \usepackage[T1]{fontenc}
+    \usepackage[utf8]{inputenc}
 \fi
 
 % Some settings:
@@ -147,71 +149,51 @@
     \begin{header}
         \fontsize{25 pt}{25 pt}\selectfont John Doe
 
-        \vspace{0.3 cm}
+        \vspace{5 pt}
 
         \normalsize
-        \mbox{
-            Istanbul, Turkey
-        }
-        \kern 0.25 cm
-        \AND
-        \kern 0.25 cm
-        \mbox{
-            \hrefWithoutArrow{mailto:johndoe@example.com}{johndoe@example.com}
-        }
-        \kern 0.25 cm
-        \AND
-        \kern 0.25 cm
-        \mbox{
-            \hrefWithoutArrow{tel:+90-541-999-99-99}{+90 541 999 99 99}
-        }
-        \kern 0.25 cm
-        \AND
-        \kern 0.25 cm
-        \mbox{
-            \hrefWithoutArrow{https://example.com/}{example.com}
-        }
-        \kern 0.25 cm
-        \AND
-        \kern 0.25 cm
-        \mbox{
-            \hrefWithoutArrow{https://linkedin.com/in/johndoe}{linkedin.com/in/johndoe}
-        }
-        \kern 0.25 cm
-        \AND
-        \kern 0.25 cm
-        \mbox{
-            \hrefWithoutArrow{https://github.com/johndoe}{github.com/johndoe}
-        }
-        \kern 0.25 cm
-        \AND
-        \kern 0.25 cm
-        \mbox{
-            \hrefWithoutArrow{https://instagram.com/johndoe}{instagram.com/johndoe}
-        }
-        \kern 0.25 cm
-        \AND
-        \kern 0.25 cm
-        \mbox{
-            \hrefWithoutArrow{https://orcid.org/0000-0000-0000-0000}{orcid.org/0000-0000-0000-0000}
-        }
-        \kern 0.25 cm
-        \AND
-        \kern 0.25 cm
-        \mbox{
-            \hrefWithoutArrow{https://example/@johndoe}{example/@johndoe}
-        }
-        \kern 0.25 cm
-        \AND
-        \kern 0.25 cm
-        \mbox{
-            \hrefWithoutArrow{https://twitter.com/johndoe}{twitter.com/johndoe}
-        }
-        \kern 0.25 cm
-        \kern 0.25 cm
+        \mbox{Istanbul, Turkey}%
+        \kern 5.0 pt%
+        \AND%
+        \kern 5.0 pt%
+        \mbox{\hrefWithoutArrow{mailto:johndoe@example.com}{johndoe@example.com}}%
+        \kern 5.0 pt%
+        \AND%
+        \kern 5.0 pt%
+        \mbox{\hrefWithoutArrow{tel:+90-541-999-99-99}{+90 541 999 99 99}}%
+        \kern 5.0 pt%
+        \AND%
+        \kern 5.0 pt%
+        \mbox{\hrefWithoutArrow{https://example.com/}{example.com}}%
+        \kern 5.0 pt%
+        \AND%
+        \kern 5.0 pt%
+        \mbox{\hrefWithoutArrow{https://linkedin.com/in/johndoe}{linkedin.com/in/johndoe}}%
+        \kern 5.0 pt%
+        \AND%
+        \kern 5.0 pt%
+        \mbox{\hrefWithoutArrow{https://github.com/johndoe}{github.com/johndoe}}%
+        \kern 5.0 pt%
+        \AND%
+        \kern 5.0 pt%
+        \mbox{\hrefWithoutArrow{https://instagram.com/johndoe}{instagram.com/johndoe}}%
+        \kern 5.0 pt%
+        \AND%
+        \kern 5.0 pt%
+        \mbox{\hrefWithoutArrow{https://orcid.org/0000-0000-0000-0000}{orcid.org/0000-0000-0000-0000}}%
+        \kern 5.0 pt%
+        \AND%
+        \kern 5.0 pt%
+        \mbox{\hrefWithoutArrow{https://example/@johndoe}{example/@johndoe}}%
+        \kern 5.0 pt%
+        \AND%
+        \kern 5.0 pt%
+        \mbox{\hrefWithoutArrow{https://twitter.com/johndoe}{twitter.com/johndoe}}%
+        \kern 5.0 pt%
+        \kern 5.0 pt%
     \end{header}
 
-    \vspace{0.3 cm - 0.3 cm}
+    \vspace{5 pt - 0.3 cm}
 
 
     \section{Text Entries}
diff --git a/tests/testdata/test_generate_latex_file/sb2nov_empty.tex b/tests/testdata/test_generate_latex_file/sb2nov_empty.tex
index 496f4531..0d138281 100644
--- a/tests/testdata/test_generate_latex_file/sb2nov_empty.tex
+++ b/tests/testdata/test_generate_latex_file/sb2nov_empty.tex
@@ -38,6 +38,8 @@
 \ifPDFTeX
     \input{glyphtounicode}
     \pdfgentounicode=1
+    % \usepackage[T1]{fontenc} % this breaks sb2nov
+    \usepackage[utf8]{inputenc}
 \fi
 
 % Some settings:
diff --git a/tests/testdata/test_generate_latex_file/sb2nov_filled.tex b/tests/testdata/test_generate_latex_file/sb2nov_filled.tex
index 39b87b9d..58486008 100644
--- a/tests/testdata/test_generate_latex_file/sb2nov_filled.tex
+++ b/tests/testdata/test_generate_latex_file/sb2nov_filled.tex
@@ -38,6 +38,8 @@
 \ifPDFTeX
     \input{glyphtounicode}
     \pdfgentounicode=1
+    % \usepackage[T1]{fontenc} % this breaks sb2nov
+    \usepackage[utf8]{inputenc}
 \fi
 
 % Some settings:
@@ -161,45 +163,25 @@
         \vspace{0.3 cm}
 
         \normalsize
-        \mbox{
-            {\color{black}{\footnotesize\faMapMarker*}\hspace*{0.13cm}Istanbul, Turkey}
-        }
+        \mbox{{\color{black}{\footnotesize\faMapMarker*}\hspace*{0.13cm}Istanbul, Turkey}}
         \kern 0.5 cm
-        \mbox{
-            \hrefWithoutArrow{mailto:johndoe@example.com}{\color{black}{\footnotesize\faEnvelope[regular]}\hspace*{0.13cm}johndoe@example.com}
-        }
+        \mbox{\hrefWithoutArrow{mailto:johndoe@example.com}{\color{black}{\footnotesize\faEnvelope[regular]}\hspace*{0.13cm}johndoe@example.com}}
         \kern 0.5 cm
-        \mbox{
-            \hrefWithoutArrow{tel:+90-541-999-99-99}{\color{black}{\footnotesize\faPhone*}\hspace*{0.13cm}+90 541 999 99 99}
-        }
+        \mbox{\hrefWithoutArrow{tel:+90-541-999-99-99}{\color{black}{\footnotesize\faPhone*}\hspace*{0.13cm}+90 541 999 99 99}}
         \kern 0.5 cm
-        \mbox{
-            \hrefWithoutArrow{https://example.com/}{\color{black}{\footnotesize\faLink}\hspace*{0.13cm}example.com}
-        }
+        \mbox{\hrefWithoutArrow{https://example.com/}{\color{black}{\footnotesize\faLink}\hspace*{0.13cm}example.com}}
         \kern 0.5 cm
-        \mbox{
-            \hrefWithoutArrow{https://linkedin.com/in/johndoe}{\color{black}{\footnotesize\faLinkedinIn}\hspace*{0.13cm}johndoe}
-        }
+        \mbox{\hrefWithoutArrow{https://linkedin.com/in/johndoe}{\color{black}{\footnotesize\faLinkedinIn}\hspace*{0.13cm}johndoe}}
         \kern 0.5 cm
-        \mbox{
-            \hrefWithoutArrow{https://github.com/johndoe}{\color{black}{\footnotesize\faGithub}\hspace*{0.13cm}johndoe}
-        }
+        \mbox{\hrefWithoutArrow{https://github.com/johndoe}{\color{black}{\footnotesize\faGithub}\hspace*{0.13cm}johndoe}}
         \kern 0.5 cm
-        \mbox{
-            \hrefWithoutArrow{https://instagram.com/johndoe}{\color{black}{\footnotesize\faInstagram}\hspace*{0.13cm}johndoe}
-        }
+        \mbox{\hrefWithoutArrow{https://instagram.com/johndoe}{\color{black}{\footnotesize\faInstagram}\hspace*{0.13cm}johndoe}}
         \kern 0.5 cm
-        \mbox{
-            \hrefWithoutArrow{https://orcid.org/0000-0000-0000-0000}{\color{black}{\footnotesize\faOrcid}\hspace*{0.13cm}0000-0000-0000-0000}
-        }
+        \mbox{\hrefWithoutArrow{https://orcid.org/0000-0000-0000-0000}{\color{black}{\footnotesize\faOrcid}\hspace*{0.13cm}0000-0000-0000-0000}}
         \kern 0.5 cm
-        \mbox{
-            \hrefWithoutArrow{https://example/@johndoe}{\color{black}{\footnotesize\faMastodon}\hspace*{0.13cm}@johndoe@example}
-        }
+        \mbox{\hrefWithoutArrow{https://example/@johndoe}{\color{black}{\footnotesize\faMastodon}\hspace*{0.13cm}@johndoe@example}}
         \kern 0.5 cm
-        \mbox{
-            \hrefWithoutArrow{https://twitter.com/johndoe}{\color{black}{\footnotesize\faTwitter}\hspace*{0.13cm}johndoe}
-        }
+        \mbox{\hrefWithoutArrow{https://twitter.com/johndoe}{\color{black}{\footnotesize\faTwitter}\hspace*{0.13cm}johndoe}}
         \kern 0.5 cm
     \end{header}
 
diff --git a/tests/testdata/test_generate_latex_file_and_copy_theme_files/classic_empty/None_CV.tex b/tests/testdata/test_generate_latex_file_and_copy_theme_files/classic_empty/None_CV.tex
index 8463d07c..d54695eb 100644
--- a/tests/testdata/test_generate_latex_file_and_copy_theme_files/classic_empty/None_CV.tex
+++ b/tests/testdata/test_generate_latex_file_and_copy_theme_files/classic_empty/None_CV.tex
@@ -41,6 +41,8 @@
 \ifPDFTeX
     \input{glyphtounicode}
     \pdfgentounicode=1
+    \usepackage[T1]{fontenc}
+    \usepackage[utf8]{inputenc}
 \fi
 
 % Some settings:
diff --git a/tests/testdata/test_generate_latex_file_and_copy_theme_files/classic_filled/John_Doe_CV.tex b/tests/testdata/test_generate_latex_file_and_copy_theme_files/classic_filled/John_Doe_CV.tex
index ed7839a3..c00c35e8 100644
--- a/tests/testdata/test_generate_latex_file_and_copy_theme_files/classic_filled/John_Doe_CV.tex
+++ b/tests/testdata/test_generate_latex_file_and_copy_theme_files/classic_filled/John_Doe_CV.tex
@@ -41,6 +41,8 @@
 \ifPDFTeX
     \input{glyphtounicode}
     \pdfgentounicode=1
+    \usepackage[T1]{fontenc}
+    \usepackage[utf8]{inputenc}
 \fi
 
 % Some settings:
@@ -162,45 +164,25 @@
         \vspace{0.3 cm}
 
         \normalsize
-        \mbox{
-            {\footnotesize\faMapMarker*}\hspace*{0.13cm}Istanbul, Turkey
-        }
+        \mbox{{\footnotesize\faMapMarker*}\hspace*{0.13cm}Istanbul, Turkey}
         \kern 0.5 cm
-        \mbox{
-            \hrefWithoutArrow{mailto:johndoe@example.com}{{\footnotesize\faEnvelope[regular]}\hspace*{0.13cm}johndoe@example.com}
-        }
+        \mbox{\hrefWithoutArrow{mailto:johndoe@example.com}{{\footnotesize\faEnvelope[regular]}\hspace*{0.13cm}johndoe@example.com}}
         \kern 0.5 cm
-        \mbox{
-            \hrefWithoutArrow{tel:+90-541-999-99-99}{{\footnotesize\faPhone*}\hspace*{0.13cm}+90 541 999 99 99}
-        }
+        \mbox{\hrefWithoutArrow{tel:+90-541-999-99-99}{{\footnotesize\faPhone*}\hspace*{0.13cm}+90 541 999 99 99}}
         \kern 0.5 cm
-        \mbox{
-            \hrefWithoutArrow{https://example.com/}{{\footnotesize\faLink}\hspace*{0.13cm}example.com}
-        }
+        \mbox{\hrefWithoutArrow{https://example.com/}{{\footnotesize\faLink}\hspace*{0.13cm}example.com}}
         \kern 0.5 cm
-        \mbox{
-            \hrefWithoutArrow{https://linkedin.com/in/johndoe}{{\footnotesize\faLinkedinIn}\hspace*{0.13cm}johndoe}
-        }
+        \mbox{\hrefWithoutArrow{https://linkedin.com/in/johndoe}{{\footnotesize\faLinkedinIn}\hspace*{0.13cm}johndoe}}
         \kern 0.5 cm
-        \mbox{
-            \hrefWithoutArrow{https://github.com/johndoe}{{\footnotesize\faGithub}\hspace*{0.13cm}johndoe}
-        }
+        \mbox{\hrefWithoutArrow{https://github.com/johndoe}{{\footnotesize\faGithub}\hspace*{0.13cm}johndoe}}
         \kern 0.5 cm
-        \mbox{
-            \hrefWithoutArrow{https://instagram.com/johndoe}{{\footnotesize\faInstagram}\hspace*{0.13cm}johndoe}
-        }
+        \mbox{\hrefWithoutArrow{https://instagram.com/johndoe}{{\footnotesize\faInstagram}\hspace*{0.13cm}johndoe}}
         \kern 0.5 cm
-        \mbox{
-            \hrefWithoutArrow{https://orcid.org/0000-0000-0000-0000}{{\footnotesize\faOrcid}\hspace*{0.13cm}0000-0000-0000-0000}
-        }
+        \mbox{\hrefWithoutArrow{https://orcid.org/0000-0000-0000-0000}{{\footnotesize\faOrcid}\hspace*{0.13cm}0000-0000-0000-0000}}
         \kern 0.5 cm
-        \mbox{
-            \hrefWithoutArrow{https://example/@johndoe}{{\footnotesize\faMastodon}\hspace*{0.13cm}@johndoe@example}
-        }
+        \mbox{\hrefWithoutArrow{https://example/@johndoe}{{\footnotesize\faMastodon}\hspace*{0.13cm}@johndoe@example}}
         \kern 0.5 cm
-        \mbox{
-            \hrefWithoutArrow{https://twitter.com/johndoe}{{\footnotesize\faTwitter}\hspace*{0.13cm}johndoe}
-        }
+        \mbox{\hrefWithoutArrow{https://twitter.com/johndoe}{{\footnotesize\faTwitter}\hspace*{0.13cm}johndoe}}
         \kern 0.5 cm
     \end{header}
 
diff --git a/tests/testdata/test_generate_latex_file_and_copy_theme_files/engineeringresumes_empty/None_CV.tex b/tests/testdata/test_generate_latex_file_and_copy_theme_files/engineeringresumes_empty/None_CV.tex
index efb06bc4..8228a48f 100644
--- a/tests/testdata/test_generate_latex_file_and_copy_theme_files/engineeringresumes_empty/None_CV.tex
+++ b/tests/testdata/test_generate_latex_file_and_copy_theme_files/engineeringresumes_empty/None_CV.tex
@@ -41,6 +41,8 @@
 \ifPDFTeX
     \input{glyphtounicode}
     \pdfgentounicode=1
+    \usepackage[T1]{fontenc}
+    \usepackage[utf8]{inputenc}
 \fi
 
 % Some settings:
diff --git a/tests/testdata/test_generate_latex_file_and_copy_theme_files/engineeringresumes_filled/John_Doe_CV.tex b/tests/testdata/test_generate_latex_file_and_copy_theme_files/engineeringresumes_filled/John_Doe_CV.tex
index c1111236..def528b9 100644
--- a/tests/testdata/test_generate_latex_file_and_copy_theme_files/engineeringresumes_filled/John_Doe_CV.tex
+++ b/tests/testdata/test_generate_latex_file_and_copy_theme_files/engineeringresumes_filled/John_Doe_CV.tex
@@ -41,6 +41,8 @@
 \ifPDFTeX
     \input{glyphtounicode}
     \pdfgentounicode=1
+    \usepackage[T1]{fontenc}
+    \usepackage[utf8]{inputenc}
 \fi
 
 % Some settings:
@@ -147,71 +149,51 @@
     \begin{header}
         \fontsize{25 pt}{25 pt}\selectfont John Doe
 
-        \vspace{0.3 cm}
+        \vspace{5 pt}
 
         \normalsize
-        \mbox{
-            Istanbul, Turkey
-        }
-        \kern 0.25 cm
-        \AND
-        \kern 0.25 cm
-        \mbox{
-            \hrefWithoutArrow{mailto:johndoe@example.com}{johndoe@example.com}
-        }
-        \kern 0.25 cm
-        \AND
-        \kern 0.25 cm
-        \mbox{
-            \hrefWithoutArrow{tel:+90-541-999-99-99}{+90 541 999 99 99}
-        }
-        \kern 0.25 cm
-        \AND
-        \kern 0.25 cm
-        \mbox{
-            \hrefWithoutArrow{https://example.com/}{example.com}
-        }
-        \kern 0.25 cm
-        \AND
-        \kern 0.25 cm
-        \mbox{
-            \hrefWithoutArrow{https://linkedin.com/in/johndoe}{linkedin.com/in/johndoe}
-        }
-        \kern 0.25 cm
-        \AND
-        \kern 0.25 cm
-        \mbox{
-            \hrefWithoutArrow{https://github.com/johndoe}{github.com/johndoe}
-        }
-        \kern 0.25 cm
-        \AND
-        \kern 0.25 cm
-        \mbox{
-            \hrefWithoutArrow{https://instagram.com/johndoe}{instagram.com/johndoe}
-        }
-        \kern 0.25 cm
-        \AND
-        \kern 0.25 cm
-        \mbox{
-            \hrefWithoutArrow{https://orcid.org/0000-0000-0000-0000}{orcid.org/0000-0000-0000-0000}
-        }
-        \kern 0.25 cm
-        \AND
-        \kern 0.25 cm
-        \mbox{
-            \hrefWithoutArrow{https://example/@johndoe}{example/@johndoe}
-        }
-        \kern 0.25 cm
-        \AND
-        \kern 0.25 cm
-        \mbox{
-            \hrefWithoutArrow{https://twitter.com/johndoe}{twitter.com/johndoe}
-        }
-        \kern 0.25 cm
-        \kern 0.25 cm
+        \mbox{Istanbul, Turkey}%
+        \kern 5.0 pt%
+        \AND%
+        \kern 5.0 pt%
+        \mbox{\hrefWithoutArrow{mailto:johndoe@example.com}{johndoe@example.com}}%
+        \kern 5.0 pt%
+        \AND%
+        \kern 5.0 pt%
+        \mbox{\hrefWithoutArrow{tel:+90-541-999-99-99}{+90 541 999 99 99}}%
+        \kern 5.0 pt%
+        \AND%
+        \kern 5.0 pt%
+        \mbox{\hrefWithoutArrow{https://example.com/}{example.com}}%
+        \kern 5.0 pt%
+        \AND%
+        \kern 5.0 pt%
+        \mbox{\hrefWithoutArrow{https://linkedin.com/in/johndoe}{linkedin.com/in/johndoe}}%
+        \kern 5.0 pt%
+        \AND%
+        \kern 5.0 pt%
+        \mbox{\hrefWithoutArrow{https://github.com/johndoe}{github.com/johndoe}}%
+        \kern 5.0 pt%
+        \AND%
+        \kern 5.0 pt%
+        \mbox{\hrefWithoutArrow{https://instagram.com/johndoe}{instagram.com/johndoe}}%
+        \kern 5.0 pt%
+        \AND%
+        \kern 5.0 pt%
+        \mbox{\hrefWithoutArrow{https://orcid.org/0000-0000-0000-0000}{orcid.org/0000-0000-0000-0000}}%
+        \kern 5.0 pt%
+        \AND%
+        \kern 5.0 pt%
+        \mbox{\hrefWithoutArrow{https://example/@johndoe}{example/@johndoe}}%
+        \kern 5.0 pt%
+        \AND%
+        \kern 5.0 pt%
+        \mbox{\hrefWithoutArrow{https://twitter.com/johndoe}{twitter.com/johndoe}}%
+        \kern 5.0 pt%
+        \kern 5.0 pt%
     \end{header}
 
-    \vspace{0.3 cm - 0.3 cm}
+    \vspace{5 pt - 0.3 cm}
 
 
     \section{Text Entries}
diff --git a/tests/testdata/test_generate_latex_file_and_copy_theme_files/sb2nov_empty/None_CV.tex b/tests/testdata/test_generate_latex_file_and_copy_theme_files/sb2nov_empty/None_CV.tex
index 496f4531..0d138281 100644
--- a/tests/testdata/test_generate_latex_file_and_copy_theme_files/sb2nov_empty/None_CV.tex
+++ b/tests/testdata/test_generate_latex_file_and_copy_theme_files/sb2nov_empty/None_CV.tex
@@ -38,6 +38,8 @@
 \ifPDFTeX
     \input{glyphtounicode}
     \pdfgentounicode=1
+    % \usepackage[T1]{fontenc} % this breaks sb2nov
+    \usepackage[utf8]{inputenc}
 \fi
 
 % Some settings:
diff --git a/tests/testdata/test_generate_latex_file_and_copy_theme_files/sb2nov_filled/John_Doe_CV.tex b/tests/testdata/test_generate_latex_file_and_copy_theme_files/sb2nov_filled/John_Doe_CV.tex
index 39b87b9d..58486008 100644
--- a/tests/testdata/test_generate_latex_file_and_copy_theme_files/sb2nov_filled/John_Doe_CV.tex
+++ b/tests/testdata/test_generate_latex_file_and_copy_theme_files/sb2nov_filled/John_Doe_CV.tex
@@ -38,6 +38,8 @@
 \ifPDFTeX
     \input{glyphtounicode}
     \pdfgentounicode=1
+    % \usepackage[T1]{fontenc} % this breaks sb2nov
+    \usepackage[utf8]{inputenc}
 \fi
 
 % Some settings:
@@ -161,45 +163,25 @@
         \vspace{0.3 cm}
 
         \normalsize
-        \mbox{
-            {\color{black}{\footnotesize\faMapMarker*}\hspace*{0.13cm}Istanbul, Turkey}
-        }
+        \mbox{{\color{black}{\footnotesize\faMapMarker*}\hspace*{0.13cm}Istanbul, Turkey}}
         \kern 0.5 cm
-        \mbox{
-            \hrefWithoutArrow{mailto:johndoe@example.com}{\color{black}{\footnotesize\faEnvelope[regular]}\hspace*{0.13cm}johndoe@example.com}
-        }
+        \mbox{\hrefWithoutArrow{mailto:johndoe@example.com}{\color{black}{\footnotesize\faEnvelope[regular]}\hspace*{0.13cm}johndoe@example.com}}
         \kern 0.5 cm
-        \mbox{
-            \hrefWithoutArrow{tel:+90-541-999-99-99}{\color{black}{\footnotesize\faPhone*}\hspace*{0.13cm}+90 541 999 99 99}
-        }
+        \mbox{\hrefWithoutArrow{tel:+90-541-999-99-99}{\color{black}{\footnotesize\faPhone*}\hspace*{0.13cm}+90 541 999 99 99}}
         \kern 0.5 cm
-        \mbox{
-            \hrefWithoutArrow{https://example.com/}{\color{black}{\footnotesize\faLink}\hspace*{0.13cm}example.com}
-        }
+        \mbox{\hrefWithoutArrow{https://example.com/}{\color{black}{\footnotesize\faLink}\hspace*{0.13cm}example.com}}
         \kern 0.5 cm
-        \mbox{
-            \hrefWithoutArrow{https://linkedin.com/in/johndoe}{\color{black}{\footnotesize\faLinkedinIn}\hspace*{0.13cm}johndoe}
-        }
+        \mbox{\hrefWithoutArrow{https://linkedin.com/in/johndoe}{\color{black}{\footnotesize\faLinkedinIn}\hspace*{0.13cm}johndoe}}
         \kern 0.5 cm
-        \mbox{
-            \hrefWithoutArrow{https://github.com/johndoe}{\color{black}{\footnotesize\faGithub}\hspace*{0.13cm}johndoe}
-        }
+        \mbox{\hrefWithoutArrow{https://github.com/johndoe}{\color{black}{\footnotesize\faGithub}\hspace*{0.13cm}johndoe}}
         \kern 0.5 cm
-        \mbox{
-            \hrefWithoutArrow{https://instagram.com/johndoe}{\color{black}{\footnotesize\faInstagram}\hspace*{0.13cm}johndoe}
-        }
+        \mbox{\hrefWithoutArrow{https://instagram.com/johndoe}{\color{black}{\footnotesize\faInstagram}\hspace*{0.13cm}johndoe}}
         \kern 0.5 cm
-        \mbox{
-            \hrefWithoutArrow{https://orcid.org/0000-0000-0000-0000}{\color{black}{\footnotesize\faOrcid}\hspace*{0.13cm}0000-0000-0000-0000}
-        }
+        \mbox{\hrefWithoutArrow{https://orcid.org/0000-0000-0000-0000}{\color{black}{\footnotesize\faOrcid}\hspace*{0.13cm}0000-0000-0000-0000}}
         \kern 0.5 cm
-        \mbox{
-            \hrefWithoutArrow{https://example/@johndoe}{\color{black}{\footnotesize\faMastodon}\hspace*{0.13cm}@johndoe@example}
-        }
+        \mbox{\hrefWithoutArrow{https://example/@johndoe}{\color{black}{\footnotesize\faMastodon}\hspace*{0.13cm}@johndoe@example}}
         \kern 0.5 cm
-        \mbox{
-            \hrefWithoutArrow{https://twitter.com/johndoe}{\color{black}{\footnotesize\faTwitter}\hspace*{0.13cm}johndoe}
-        }
+        \mbox{\hrefWithoutArrow{https://twitter.com/johndoe}{\color{black}{\footnotesize\faTwitter}\hspace*{0.13cm}johndoe}}
         \kern 0.5 cm
     \end{header}
 
diff --git a/tests/testdata/test_latex_to_pdf/classic_empty.pdf b/tests/testdata/test_latex_to_pdf/classic_empty.pdf
index e5d287d0..388bc3a5 100644
Binary files a/tests/testdata/test_latex_to_pdf/classic_empty.pdf and b/tests/testdata/test_latex_to_pdf/classic_empty.pdf differ
diff --git a/tests/testdata/test_latex_to_pdf/classic_filled.pdf b/tests/testdata/test_latex_to_pdf/classic_filled.pdf
index 30d1a169..64bdf392 100644
Binary files a/tests/testdata/test_latex_to_pdf/classic_filled.pdf and b/tests/testdata/test_latex_to_pdf/classic_filled.pdf differ
diff --git a/tests/testdata/test_latex_to_pdf/engineeringresumes_empty.pdf b/tests/testdata/test_latex_to_pdf/engineeringresumes_empty.pdf
index b4e207e6..f0dd5cde 100644
Binary files a/tests/testdata/test_latex_to_pdf/engineeringresumes_empty.pdf and b/tests/testdata/test_latex_to_pdf/engineeringresumes_empty.pdf differ
diff --git a/tests/testdata/test_latex_to_pdf/engineeringresumes_filled.pdf b/tests/testdata/test_latex_to_pdf/engineeringresumes_filled.pdf
index 9d940220..e4596a99 100644
Binary files a/tests/testdata/test_latex_to_pdf/engineeringresumes_filled.pdf and b/tests/testdata/test_latex_to_pdf/engineeringresumes_filled.pdf differ
diff --git a/tests/testdata/test_latex_to_pdf/moderncv_empty.pdf b/tests/testdata/test_latex_to_pdf/moderncv_empty.pdf
index 5f72738e..bc34e376 100644
Binary files a/tests/testdata/test_latex_to_pdf/moderncv_empty.pdf and b/tests/testdata/test_latex_to_pdf/moderncv_empty.pdf differ
diff --git a/tests/testdata/test_latex_to_pdf/moderncv_filled.pdf b/tests/testdata/test_latex_to_pdf/moderncv_filled.pdf
index 2fddfc89..e60756cc 100644
Binary files a/tests/testdata/test_latex_to_pdf/moderncv_filled.pdf and b/tests/testdata/test_latex_to_pdf/moderncv_filled.pdf differ
diff --git a/tests/testdata/test_latex_to_pdf/sb2nov_empty.pdf b/tests/testdata/test_latex_to_pdf/sb2nov_empty.pdf
index be72b148..00864b6c 100644
Binary files a/tests/testdata/test_latex_to_pdf/sb2nov_empty.pdf and b/tests/testdata/test_latex_to_pdf/sb2nov_empty.pdf differ
diff --git a/tests/testdata/test_latex_to_pdf/sb2nov_filled.pdf b/tests/testdata/test_latex_to_pdf/sb2nov_filled.pdf
index a29d59ed..b03d6505 100644
Binary files a/tests/testdata/test_latex_to_pdf/sb2nov_filled.pdf and b/tests/testdata/test_latex_to_pdf/sb2nov_filled.pdf differ