diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
index b922e7d..dd4645d 100644
--- a/layouts/_default/baseof.html
+++ b/layouts/_default/baseof.html
@@ -12,7 +12,6 @@
   {{ hugo.Generator }}
   {{ $main := resources.Get "sass/main.scss" | toCSS | minify -}}
   <link rel="stylesheet" href="{{ $main.Permalink }}">
-  <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css">
   {{ block "config" . }}{{ end }}
 </head>
 <body>
@@ -24,8 +23,6 @@
     </div>
   </div>
   {{ partial "footer.html" . }}    
-  <!--<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.5.1/jquery.min.js"></script>-->
-  <!--<script src="{{ .Site.BaseURL }}js/jquery.min.js"></script>-->
   <script src="{{ .Site.BaseURL }}js/bootstrap.bundle.min.js"></script>
   {{ block "appjs" . }} {{ end }}  
 </body>
diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html
index 3ef5bff..edaddb0 100644
--- a/layouts/partials/footer.html
+++ b/layouts/partials/footer.html
@@ -4,25 +4,27 @@
 
 	  <ul class="col-md-4 text-start list-inline">
 			{{ with .Site.Params.copyright -}}
-	  	<li class="list-inline-item">
-				<span class="fa fa-copyright"></span>
+	  	<li class="list-inline-item">&copy;
 		  		<a target="_blank" href="{{ .link }}">{{ .name }}</a>
 		  </li>
 			{{- end }}
       {{ with  .Site.Params.email -}}
       <li class="social email list-inline-item">
         <a target="_blank" title="Email" 
-		 			 href="mailto:{{ . }}"><i class="fa fa-envelope"></i></a></li>
+		 			 href="mailto:{{ . }}">{{ partial "icons/envelope.svg" site }}
+		 		</a></li>
       {{- end }}
       {{ with  .Site.Params.github -}}
       <li class="social github list-inline-item">
         <a target="_blank" title="GitHub" 
-					 href="{{ . }}"><i class="fa fa-github-square"></i></a></li>
+					 href="{{ . }}">{{ partial "icons/github.svg" site }}
+				</a></li>
       {{- end }}
       {{ with  .Site.Params.sourcehut -}}
       <li class="social sourcehut list-inline-item">
         <a target="_blank" title="sourcehut git" 
-	  	 		 href="{{ . }}"><i class="fa fa-git-square"></i></a></li>
+	  	 		 href="{{ . }}">{{ partial "icons/git.svg" site }}
+	  	 	</a></li>
       {{- end }}
 	  </ul>
 
@@ -30,7 +32,7 @@
       {{ with .Site.Params.builtBy -}}
         <a target="_blank" 
 		 			 href="{{ .link }}"><img 
-		 			 src="/{{ .Site.BaseURL }}img/{{ .image }}" alt="{{ .name }}"></a>
+		 			 src="{{ site.BaseURL }}img/{{ .image }}" alt="{{ .name }}"></a>
       {{- end }}
     </div>
 
diff --git a/layouts/partials/icons/envelope.svg b/layouts/partials/icons/envelope.svg
new file mode 100644
index 0000000..122fc35
--- /dev/null
+++ b/layouts/partials/icons/envelope.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-envelope" viewBox="0 0 16 16">
+  <path d="M0 4a2 2 0 0 1 2-2h12a2 2 0 0 1 2 2v8a2 2 0 0 1-2 2H2a2 2 0 0 1-2-2V4Zm2-1a1 1 0 0 0-1 1v.217l7 4.2 7-4.2V4a1 1 0 0 0-1-1H2Zm13 2.383-4.708 2.825L15 11.105V5.383Zm-.034 6.876-5.64-3.471L8 9.583l-1.326-.795-5.64 3.47A1 1 0 0 0 2 13h12a1 1 0 0 0 .966-.741ZM1 11.105l4.708-2.897L1 5.383v5.722Z"/>
+</svg>
\ No newline at end of file
diff --git a/layouts/partials/icons/git.svg b/layouts/partials/icons/git.svg
new file mode 100644
index 0000000..092d23e
--- /dev/null
+++ b/layouts/partials/icons/git.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-git" viewBox="0 0 16 16">
+  <path d="M15.698 7.287 8.712.302a1.03 1.03 0 0 0-1.457 0l-1.45 1.45 1.84 1.84a1.223 1.223 0 0 1 1.55 1.56l1.773 1.774a1.224 1.224 0 0 1 1.267 2.025 1.226 1.226 0 0 1-2.002-1.334L8.58 5.963v4.353a1.226 1.226 0 1 1-1.008-.036V5.887a1.226 1.226 0 0 1-.666-1.608L5.093 2.465l-4.79 4.79a1.03 1.03 0 0 0 0 1.457l6.986 6.986a1.03 1.03 0 0 0 1.457 0l6.953-6.953a1.031 1.031 0 0 0 0-1.457"/>
+</svg>
\ No newline at end of file
diff --git a/layouts/partials/icons/github.svg b/layouts/partials/icons/github.svg
new file mode 100644
index 0000000..bb4e45c
--- /dev/null
+++ b/layouts/partials/icons/github.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-github" viewBox="0 0 16 16">
+  <path d="M8 0C3.58 0 0 3.58 0 8c0 3.54 2.29 6.53 5.47 7.59.4.07.55-.17.55-.38 0-.19-.01-.82-.01-1.49-2.01.37-2.53-.49-2.69-.94-.09-.23-.48-.94-.82-1.13-.28-.15-.68-.52-.01-.53.63-.01 1.08.58 1.23.82.72 1.21 1.87.87 2.33.66.07-.52.28-.87.51-1.07-1.78-.2-3.64-.89-3.64-3.95 0-.87.31-1.59.82-2.15-.08-.2-.36-1.02.08-2.12 0 0 .67-.21 2.2.82.64-.18 1.32-.27 2-.27.68 0 1.36.09 2 .27 1.53-1.04 2.2-.82 2.2-.82.44 1.1.16 1.92.08 2.12.51.56.82 1.27.82 2.15 0 3.07-1.87 3.75-3.65 3.95.29.25.54.73.54 1.48 0 1.07-.01 1.93-.01 2.2 0 .21.15.46.55.38A8.012 8.012 0 0 0 16 8c0-4.42-3.58-8-8-8z"/>
+</svg>
\ No newline at end of file
