diff --git a/rendercv/templates/classic/classic.tex.j2 b/rendercv/templates/classic/classic.tex.j2
index 98c6e99..f56545c 100644
--- a/rendercv/templates/classic/classic.tex.j2
+++ b/rendercv/templates/classic/classic.tex.j2
@@ -101,8 +101,8 @@
         study_type=edu.study_type,
         institution=edu.institution,
         area=edu.area,
-        highlights=edu.highlights,
-        dates_and_locations=[edu.start_date]
+        highlights=edu.highlight_strings,
+        date_and_location_strings=edu.date_and_location_strings
     )|indent(4)>>
     ((* endfor *))
 
@@ -112,7 +112,7 @@
         company=work.company,
         position=work.position,
         highlights=work.highlights,
-        dates_and_locations=[work.start_date]
+        date_and_location_strings=[work.start_date]
     )|indent(4)>>
     ((* endfor *))
 \end{document}
\ No newline at end of file
diff --git a/rendercv/templates/classic/components/date_and_location_strings.tex.j2 b/rendercv/templates/classic/components/date_and_location_strings.tex.j2
new file mode 100644
index 0000000..0db2892
--- /dev/null
+++ b/rendercv/templates/classic/components/date_and_location_strings.tex.j2
@@ -0,0 +1,9 @@
+((* macro date_and_location_strings(date_and_location_strings) *))
+((* for item in date_and_location_strings *))
+    ((* if loop.last *))
+<<item>>
+    ((* else *))
+<<item>>\newline
+    ((* endif *))
+((* endfor *))
+((* endmacro *))
\ No newline at end of file
diff --git a/rendercv/templates/classic/components/dates_and_locations.tex.j2 b/rendercv/templates/classic/components/dates_and_locations.tex.j2
deleted file mode 100644
index 9158773..0000000
--- a/rendercv/templates/classic/components/dates_and_locations.tex.j2
+++ /dev/null
@@ -1,9 +0,0 @@
-((* macro dates_and_locations(dates_and_locations) *))
-((* for item in dates_and_locations *))
-    ((* if loop.last *))
-<<item>>
-    ((* else *))
-<<item>>\newline
-    ((* endif *))
-((* endfor *))
-((* endmacro *))
\ No newline at end of file
diff --git a/rendercv/templates/classic/components/education.tex.j2 b/rendercv/templates/classic/components/education.tex.j2
index 65b47fe..9fc349b 100644
--- a/rendercv/templates/classic/components/education.tex.j2
+++ b/rendercv/templates/classic/components/education.tex.j2
@@ -1,7 +1,7 @@
 ((* from "components/highlights.tex.j2" import highlights as print_higlights with context *))
-((* from "components/dates_and_locations.tex.j2" import dates_and_locations as print_date_and_locations *))
+((* from "components/date_and_location_strings.tex.j2" import date_and_location_strings as print_date_and_locations *))
 
-((* macro education(study_type, institution, area, highlights, dates_and_locations)*))
+((* macro education(study_type, institution, area, highlights, date_and_location_strings)*))
 ((# \begin{tabularx}{⟨width⟩}[⟨pos⟩]{⟨preamble⟩} #))
     ((# width: \textwidth #))
     ((# preamble: first column, second column, third column #))
@@ -15,7 +15,7 @@
 
     <<print_higlights(highlights)|indent(4)>>
     &
-    <<print_date_and_locations(dates_and_locations)|indent(4)>>
+    <<print_date_and_locations(date_and_location_strings)|indent(4)>>
 \end{tabularx}
 
 \vspace{<<design.vertical_margin_between_entries>>}
diff --git a/rendercv/templates/classic/components/experience.tex.j2 b/rendercv/templates/classic/components/experience.tex.j2
index e775f3f..b597b4c 100644
--- a/rendercv/templates/classic/components/experience.tex.j2
+++ b/rendercv/templates/classic/components/experience.tex.j2
@@ -1,7 +1,7 @@
 ((* from "components/highlights.tex.j2" import highlights as print_higlights with context *))
-((* from "components/dates_and_locations.tex.j2" import dates_and_locations as print_date_and_locations *))
+((* from "components/date_and_location_strings.tex.j2" import date_and_location_strings as print_date_and_locations *))
 
-((* macro experience(company, position, highlights, dates_and_locations)*))
+((* macro experience(company, position, highlights, date_and_location_strings)*))
 ((# \begin{tabularx}{⟨width⟩}[⟨pos⟩]{⟨preamble⟩} #))
     ((# width: \textwidth #))
     ((# preamble: first column, second column #))
@@ -12,7 +12,7 @@
 
     <<print_higlights(highlights)|indent(4)>>
     &
-    <<print_date_and_locations(dates_and_locations)|indent(4)>>
+    <<print_date_and_locations(date_and_location_strings)|indent(4)>>
 \end{tabularx}
 
 \vspace{<<design.vertical_margin_between_entries>>}
diff --git a/rendercv/templates/classic/components/header_connections.tex.j2 b/rendercv/templates/classic/components/header_connections.tex.j2
index fa7161b..396a459 100644
--- a/rendercv/templates/classic/components/header_connections.tex.j2
+++ b/rendercv/templates/classic/components/header_connections.tex.j2
@@ -1,8 +1,8 @@
 ((# Each macro in here is a link with an icon for header. #))
-((* macro LinkedIn(username) *))\href{https://www.linkedin.com/in/<<username>>}{\faLinkedin\hspace{0.13cm}<<username>>}((* endmacro *))
-((* macro GitHub(username) *))\href{https://www.github.com/<<username>>}{\faGithub\hspace{0.13cm}<<username>>}((* endmacro *))
-((* macro Instagram(username) *))\href{https://www.instagram.com/<<username>>}{\faInstagram\hspace{0.13cm}<<username>>}((* endmacro *))
-((* macro phone(number) *))\faPhone\hspace{0.13cm}<<number|replace("tel:", "")|replace("-"," ")>>((* endmacro *))
-((* macro email(email) *))\href{mailto:<<email>>}{\faEnvelope[regular]\hspace{0.13cm}<<email>>}((* endmacro *))
-((* macro website(url) *))\href{<<url>>}{\faLaptop\hspace{0.13cm}url}((* endmacro *))
+((* macro LinkedIn(username) *))\href{https://www.linkedin.com/in/<<username>>}{{\small\faLinkedinIn}\hspace{0.13cm}<<username>>}((* endmacro *))
+((* macro GitHub(username) *))\href{https://www.github.com/<<username>>}{{\small\faGithub}\hspace{0.13cm}<<username>>}((* endmacro *))
+((* macro Instagram(username) *))\href{https://www.instagram.com/<<username>>}{{\small\faInstagram}\hspace{0.13cm}<<username>>}((* endmacro *))
+((* macro phone(number) *)){\footnotesize\faPhone*}\hspace{0.13cm}<<number|replace("tel:", "")|replace("-"," ")>>((* endmacro *))
+((* macro email(email) *))\href{mailto:<<email>>}{{\small\faEnvelope[regular]}\hspace{0.13cm}<<email>>}((* endmacro *))
+((* macro website(url) *))\href{<<url>>}{{\small\faLink}\hspace{0.13cm}<<url|replace("https://","")|replace("/","")>>}((* endmacro *))
 
diff --git a/rendercv/templates/classic/components/project.tex.j2 b/rendercv/templates/classic/components/project.tex.j2
index 834ee46..8dbc481 100644
--- a/rendercv/templates/classic/components/project.tex.j2
+++ b/rendercv/templates/classic/components/project.tex.j2
@@ -1,5 +1,5 @@
 ((* from "components/highlights.tex.j2" import highlights as print_higlights *))
-((* from "components/dates_and_locations.tex.j2" import dates_and_locations as print_date_and_locations *))
+((* from "components/date_and_location_strings.tex.j2" import date_and_location_strings as print_date_and_locations *))
 
 ((* macro project(name, highlights, datesAndLocations)*))
 ((# \begin{tabularx}{⟨width⟩}[⟨pos⟩]{⟨preamble⟩} #))
@@ -12,7 +12,7 @@
 
     <<print_higlights(highlights)|indent(4)>>
     &
-    <<print_date_and_locations(dates_and_locations)|indent(4)>>
+    <<print_date_and_locations(date_and_location_strings)|indent(4)>>
 \end{tabularx}
 
 \vspace{<<design.vertical_margin_between_entries>>}