diff --git a/rendercv/themes/classic/Header.j2.tex b/rendercv/themes/classic/Header.j2.tex
index f0d057d..7f58f28 100644
--- a/rendercv/themes/classic/Header.j2.tex
+++ b/rendercv/themes/classic/Header.j2.tex
@@ -10,14 +10,12 @@
 
     \normalsize
     ((* for connection in cv.connections *))
-    \mbox{
-        ((* if connection["url"] *))
-        \hrefWithoutArrow{<<connection["url"]>>}{{\footnotesize<<connection["latex_icon"]>>}\hspace*{0.13cm}<<connection["placeholder"]>>}
-        ((* else *))
-        {\footnotesize<<connection["latex_icon"]>>}\hspace*{0.13cm}<<connection["placeholder"]>>
-        ((* endif *))
-    }
-    \kern <<design.margins.header.horizontal_between_connections>>
+    \mbox{((*- if connection["url"] -*))
+        \hrefWithoutArrow{<<connection["url"]>>}{<<connection["clean_url"]>>}
+        ((*- else -*))
+        <<connection["placeholder"]>>
+        ((*- endif -*))}%
+    \kern <<design.margins.header.horizontal_between_connections>>%
     ((* endfor *))
 \end{header}
 
diff --git a/rendercv/themes/engineeringresumes/Header.j2.tex b/rendercv/themes/engineeringresumes/Header.j2.tex
index d789b08..d9517ba 100644
--- a/rendercv/themes/engineeringresumes/Header.j2.tex
+++ b/rendercv/themes/engineeringresumes/Header.j2.tex
@@ -16,18 +16,16 @@
 
     \normalsize
     ((* for connection in cv.connections *))
-    \mbox{
-        ((* if connection["url"] *))
+    \mbox{((*- if connection["url"] -*))
         \hrefWithoutArrow{<<connection["url"]>>}{<<connection["clean_url"]>>}
-        ((* else *))
+        ((*- else -*))
         <<connection["placeholder"]>>
-        ((* endif *))
-    }
-    \kern <<design.margins.header.horizontal_between_connections|divide_length_by(2)>>
+        ((*- endif -*))}%
+    \kern <<design.margins.header.horizontal_between_connections|divide_length_by(2)>>%
     ((* if not loop.last *))
-    \AND
+    \AND%
     ((* endif *))
-    \kern <<design.margins.header.horizontal_between_connections|divide_length_by(2)>>
+    \kern <<design.margins.header.horizontal_between_connections|divide_length_by(2)>>%
     ((* endfor *))
 \end{header}
 
diff --git a/rendercv/themes/sb2nov/Header.j2.tex b/rendercv/themes/sb2nov/Header.j2.tex
index efa8bae..6ad85b0 100644
--- a/rendercv/themes/sb2nov/Header.j2.tex
+++ b/rendercv/themes/sb2nov/Header.j2.tex
@@ -9,14 +9,12 @@
 
     \normalsize
     ((* for connection in cv.connections *))
-    \mbox{
-        ((* if connection["url"] *))
-        \hrefWithoutArrow{<<connection["url"]>>}{\color{black}{\footnotesize<<connection["latex_icon"]>>}\hspace*{0.13cm}<<connection["placeholder"]>>}
-        ((* else *))
-        {\color{black}{\footnotesize<<connection["latex_icon"]>>}\hspace*{0.13cm}<<connection["placeholder"]>>}
-        ((* endif *))
-    }
-    \kern <<design.margins.header.horizontal_between_connections>>
+    \mbox{((*- if connection["url"] -*))
+        \hrefWithoutArrow{<<connection["url"]>>}{<<connection["clean_url"]>>}
+        ((*- else -*))
+        <<connection["placeholder"]>>
+        ((*- endif -*))}%
+    \kern <<design.margins.header.horizontal_between_connections>>%
     ((* endfor *))
 \end{header}