diff --git a/layouts/partials/svg.html b/data/svg.toml
similarity index 95%
rename from layouts/partials/svg.html
rename to data/svg.toml
index a1b598e..bce059d 100644
--- a/layouts/partials/svg.html
+++ b/data/svg.toml
@@ -1,5 +1,4 @@
-{{- $icon_name := ( trim .name " " | lower )}}
-{{- if (eq $icon_name "123rf") -}}
+123rf = '''
-{{- else if (eq $icon_name "adobestock") -}}
+'''
+adobestock = '''
-{{- else if (eq $icon_name "applemusic") -}}
+'''
+applemusic = '''
-{{- else if (eq $icon_name "behance") -}}
+'''
+behance = '''
-{{- else if (eq $icon_name "bilibili") -}}
+'''
+bilibili = '''
-{{- else if (eq $icon_name "buymeacoffee") -}}
+'''
+buymeacoffee = '''
-{{- else if (eq $icon_name "codepen") -}}
+'''
+codepen = '''
-{{- else if (eq $icon_name "cryptohack") -}}
+'''
+cryptohack = '''
-{{- else if (eq $icon_name "ctftime") -}}
+'''
+ctftime = '''
-{{- else if (eq $icon_name "cv") -}}
+'''
+cv = '''
-{{- else if (eq $icon_name "dev") -}}
+'''
+dev = '''
-{{- else if (eq $icon_name "deezer") -}}
+'''
+deezer = '''
-{{- else if (eq $icon_name "discogs") -}}
+'''
+discogs = '''
-{{- else if (eq $icon_name "discord") -}}
+'''
+discord = '''
-{{- else if (eq $icon_name "dreamstime") -}}
+'''
+dreamstime = '''
-{{- else if (eq $icon_name "dribbble") -}}
+'''
+dribbble = '''
-{{- else if (eq $icon_name "email") -}}
+'''
+email = '''
-{{- else if (eq $icon_name "facebook") -}}
+'''
+facebook = '''
-{{- else if (eq $icon_name "flickr") -}}
+'''
+flickr = '''
-{{- else if (eq $icon_name "freepik") -}}
+'''
+freepik = '''
-{{- else if (eq $icon_name "gitea") -}}
+'''
+gitea = '''
-{{- else if (eq $icon_name "github") -}}
+'''
+github = '''
-{{- else if (eq $icon_name "github-simple") -}}
+'''
+github-simple = '''
-{{- else if (eq $icon_name "gitlab") -}}
+'''
+gitlab = '''
-{{- else if (eq $icon_name "goodreads") -}}
+'''
+goodreads = '''
-{{- else if (eq $icon_name "googlescholar") -}}
+'''
+googlescholar = '''
-{{- else if (eq $icon_name "hackerone") -}}
+'''
+hackerone = '''
-{{- else if (eq $icon_name "hackerrank") -}}
+'''
+hackerrank = '''
-{{- else if (eq $icon_name "hackthebox") -}}
+'''
+hackthebox = '''
-{{- else if (eq $icon_name "instagram") -}}
+'''
+instagram = '''
-{{- else if (eq $icon_name "itchio") -}}
+'''
+itchio = '''
-{{- else if (eq $icon_name "kaggle") -}}
+'''
+kaggle = '''
-{{- else if (eq $icon_name "kakaotalk") -}}
+'''
+kakaotalk = '''
-{{- else if (eq $icon_name "keybase") -}}
+'''
+keybase = '''
-{{- else if (eq $icon_name "kofi") -}}
+'''
+kofi = '''
-{{- else if (eq $icon_name "komoot") -}}
+'''
+komoot = '''
-{{- else if (eq $icon_name "lastfm") -}}
+'''
+lastfm = '''
-{{- else if (eq $icon_name "letterboxd") -}}
+'''
+letterboxd = '''
-{{- else if (eq $icon_name "liberapay") -}}
+'''
+liberapay = '''
-{{- else if (eq $icon_name "linkedin") -}}
+'''
+linkedin = '''
-{{- else if (eq $icon_name "mastodon") -}}
+'''
+mastodon = '''
-{{- else if (eq $icon_name "matrix") -}}
+'''
+matrix = '''
-{{- else if (eq $icon_name "medium") -}}
+'''
+medium = '''
-{{- else if (eq $icon_name "mixcloud") -}}
+'''
+mixcloud = '''
-{{- else if (eq $icon_name "nuget") -}}
+'''
+nuget = '''
-{{- else if (eq $icon_name "paypal") -}}
+'''
+paypal = '''
-{{- else if or (eq $icon_name "pgpkey") (eq $icon_name "key") -}}
+'''
+pgpkey = '''
-{{- else if (eq $icon_name "phone") -}}
+'''
+phone = '''
-{{- else if (eq $icon_name "polywork") -}}
+'''
+polywork = '''
-{{- else if (eq $icon_name "qq") -}}
+'''
+qq = '''
-{{- else if (eq $icon_name "reddit") -}}
+'''
+reddit = '''
-{{- else if (eq $icon_name "researchgate") -}}
+'''
+researchgate = '''
-{{- else if (eq $icon_name "rss") -}}
+'''
+rss = '''
-{{- else if (eq $icon_name "rss-simple") -}}
+'''
+rss-simple = '''
-{{- else if (eq $icon_name "serverfault") -}}
+'''
+serverfault = '''
-{{- else if (eq $icon_name "soundcloud") -}}
+'''
+soundcloud = '''
-{{- else if (eq $icon_name "shutterstock") -}}
+'''
+shutterstock = '''
-{{- else if (eq $icon_name "slack") -}}
+'''
+slack = '''
-{{- else if (eq $icon_name "snapchat") -}}
+'''
+snapchat = '''
-{{- else if (eq $icon_name "sourcerer") -}}
+'''
+sourcerer = '''
-{{- else if (eq $icon_name "spotify") -}}
+'''
+spotify = '''
-{{- else if (eq $icon_name "stackoverflow") -}}
+'''
+stackoverflow = '''
-{{- else if (eq $icon_name "steam") -}}
+'''
+steam = '''
-{{- else if (eq $icon_name "telegram") -}}
+'''
+telegram = '''
-{{- else if (eq $icon_name "telegram-simple") -}}
+'''
+telegram-simple = '''
-{{- else if (eq $icon_name "twitch") -}}
+'''
+twitch = '''
-{{- else if (eq $icon_name "twitter") -}}
+'''
+twitter = '''
-{{- else if (eq $icon_name "twitter-simple") -}}
+'''
+twitter-simple = '''
-{{- else if (eq $icon_name "unsplash") -}}
+'''
+unsplash = '''
-{{- else if (eq $icon_name "xda") -}}
+'''
+xda = '''
-{{- else if (eq $icon_name "xing") -}}
+'''
+xing = '''
-{{- else if (eq $icon_name "ycombinator") -}}
+'''
+ycombinator = '''
-{{- else if (eq $icon_name "youtube") -}}
+'''
+youtube = '''
-{{- else if (eq $icon_name "pinboard-simple") -}}
+'''
+pinboard-simple = '''
-{{- else if $icon_name -}}
+'''
+default = '''
-{{- end -}}
+'''
diff --git a/layouts/partials/home_info.html b/layouts/partials/home_info.html
index eb55364..b9d7df9 100644
--- a/layouts/partials/home_info.html
+++ b/layouts/partials/home_info.html
@@ -7,7 +7,7 @@
{{ .Content | markdownify }}
{{- end -}}
diff --git a/layouts/partials/index_profile.html b/layouts/partials/index_profile.html
index 1bb2079..24e34fd 100644
--- a/layouts/partials/index_profile.html
+++ b/layouts/partials/index_profile.html
@@ -29,7 +29,7 @@
{{- end }}
{{ .title | default site.Title | markdownify }}
{{ .subtitle | markdownify }}
- {{- partial "social_icons.html" site.Params.socialIcons -}}
+ {{- partial "social_icons.html" (dict "icons" site.Params.socialIcons "svg" $.Site.Data.svg) -}}
{{- with .buttons }}
@@ -42,4 +42,4 @@
{{- end }}
{{- end}}
-
\ No newline at end of file
+
diff --git a/layouts/partials/social_icons.html b/layouts/partials/social_icons.html
index 7c16e30..62e156c 100644
--- a/layouts/partials/social_icons.html
+++ b/layouts/partials/social_icons.html
@@ -1,7 +1,8 @@