diff --git a/assets/scss/style.scss b/assets/scss/style.scss
index e681daf..6e6c83e 100755
--- a/assets/scss/style.scss
+++ b/assets/scss/style.scss
@@ -149,6 +149,15 @@ a {
     color: $primary-color;
     transition: color 0.25s;
   }
+
+  &.external-link {
+    .feather {
+      fill: none;
+      margin-left: 0.25rem;
+      position: relative;
+      top: 0.125em;
+    }
+  }
 }
 
 img {
diff --git a/layouts/_default/_markup/render-link.html b/layouts/_default/_markup/render-link.html
new file mode 100644
index 0000000..00f82fa
--- /dev/null
+++ b/layouts/_default/_markup/render-link.html
@@ -0,0 +1,13 @@
+{{- $absoluteDest := absLangURL .Destination -}}
+{{- $siteRootUrl := absLangURL "" -}}
+{{- $isExternal := not (hasPrefix $absoluteDest $siteRootUrl) -}}
+<a href="{{ .Destination | safeURL }}"
+  {{- with .Title }} title="{{ . }}"{{ end -}}
+  {{- if $isExternal -}}
+   class="external-link" target="_blank" rel="noopener noreferrer"
+  {{- end -}}
+>
+  {{- with .Text | safeHTML }}{{ . }}{{ end -}}
+  {{- if $isExternal -}}{{- partial "icon.html" "external-link" -}}{{- end -}}
+</a>
+{{- /* chomp trailing newline */ -}}