diff --git a/icons/aboutme.svg b/icons/about-dot-me.svg
similarity index 100%
rename from icons/aboutme.svg
rename to icons/about-dot-me.svg
diff --git a/icons/brandai.svg b/icons/brand-dot-ai.svg
similarity index 100%
rename from icons/brandai.svg
rename to icons/brand-dot-ai.svg
diff --git a/icons/coop.svg b/icons/co-op.svg
similarity index 100%
rename from icons/coop.svg
rename to icons/co-op.svg
diff --git a/icons/devto.svg b/icons/dev-dot-to.svg
similarity index 100%
rename from icons/devto.svg
rename to icons/dev-dot-to.svg
diff --git a/icons/draugiemlv.svg b/icons/draugiem-dot-lv.svg
similarity index 100%
rename from icons/draugiemlv.svg
rename to icons/draugiem-dot-lv.svg
diff --git a/icons/govuk.svg b/icons/gov-dot-uk.svg
similarity index 100%
rename from icons/govuk.svg
rename to icons/gov-dot-uk.svg
diff --git a/icons/kofi.svg b/icons/ko-fi.svg
similarity index 100%
rename from icons/kofi.svg
rename to icons/ko-fi.svg
diff --git a/icons/lastfm.svg b/icons/last-dot-fm.svg
similarity index 100%
rename from icons/lastfm.svg
rename to icons/last-dot-fm.svg
diff --git a/icons/mailru.svg b/icons/mail-dot-ru.svg
similarity index 100%
rename from icons/mailru.svg
rename to icons/mail-dot-ru.svg
diff --git a/icons/microblog.svg b/icons/micro-dot-blog.svg
similarity index 100%
rename from icons/microblog.svg
rename to icons/micro-dot-blog.svg
diff --git a/icons/nodejs.svg b/icons/node-dot-js.svg
similarity index 100%
rename from icons/nodejs.svg
rename to icons/node-dot-js.svg
diff --git a/icons/picartotv.svg b/icons/picarto-dot-tv.svg
similarity index 100%
rename from icons/picartotv.svg
rename to icons/picarto-dot-tv.svg
diff --git a/icons/playerme.svg b/icons/player-dot-me.svg
similarity index 100%
rename from icons/playerme.svg
rename to icons/player-dot-me.svg
diff --git a/icons/protoio.svg b/icons/proto-dot-io.svg
similarity index 100%
rename from icons/protoio.svg
rename to icons/proto-dot-io.svg
diff --git a/icons/vuejs.svg b/icons/vue-dot-js.svg
similarity index 100%
rename from icons/vuejs.svg
rename to icons/vue-dot-js.svg
diff --git a/index.html b/index.html
index 6368507f..10d46ba1 100644
--- a/index.html
+++ b/index.html
@@ -5,7 +5,16 @@
 {% assign greyscaleIconsUnsortedString = "" %}
 {% for icon in site.data.simple-icons.icons %}
     {% assign title = icon.title %}
-    {% assign filename = icon.title | replace: "+", "plus" | replace: " ", "" | replace: ".", "" | replace: "-", "" | replace: "!", "" | replace: "’", "" | downcase %}
+    {% assign filename = icon.title %}
+    {% assign _splitFilename = filename | split: "" %}
+    {% if _splitFilename.first == "." %}
+        {% assign filename = filename | replace_first: ".", "dot-" %}
+    {% endif %}
+    {% if _splitFilename.last == "." %}
+        {% assign _filenameLenMin1 = filename | size | minus: 1 %}
+        {% assign filename = filename | slice: 0, _filenameLenMin1 | append: "-dot" %}
+    {% endif %}
+    {% assign filename = filename | replace: "+", "plus" | replace: " ", "" | replace: ".", "-dot-" | replace: "!", "" | replace: "’", "" | downcase %}
     {% assign hex = icon.hex %}
     {% assign hex = icon.hex %}
     {% assign hexCharacter1 = hex | slice: 0, 1 %}