diff --git a/rendercv/themes/classic/Header.j2.tex b/rendercv/themes/classic/Header.j2.tex
index f163449..f971cad 100644
--- a/rendercv/themes/classic/Header.j2.tex
+++ b/rendercv/themes/classic/Header.j2.tex
@@ -1,10 +1,15 @@
+((* set orcid_url = (cv.social_networks|get_an_item_with_a_specific_attribute_value("network", "Orcid")).url *))
 ((* if design.show_last_updated_date *))
-    \placelastupdatedtext
+\placelastupdatedtext
 ((* endif *))
 
 \begin{header}
     \fontsize{<<design.header_font_size>>}{<<design.header_font_size>>}
+    ((* if orcid_url *))
+    \hrefWithoutArrow{<<orcid_url>>}{\textbf{<<cv.name>>}}
+    ((* else *))
     \textbf{<<cv.name>>}
+    ((* endif *))
 
     \vspace{<<design.margins.header.vertical_between_name_and_connections>>}
 
@@ -30,14 +35,15 @@
         "LinkedIn": "\\faLinkedinIn",
         "GitHub": "\\faGithub",
         "Instagram": "\\faInstagram",
-        "Orcid": "\\faOrcid",
         "Mastodon": "\\faMastodon",
     }
 *))
 ((* if cv.social_networks *))
     ((* for network in cv.social_networks *))
+        ((* if network.network in icon_dictionary *))
     \mbox{\hrefWithoutArrow{network.url}{{\small<<icon_dictionary[network.network]>>}\hspace{0.13cm}<<network.username>>}}
     \hspace{0.5cm}
+        ((* endif *))
     ((* endfor *))
 ((* endif *))
 \end{header}