diff --git a/app/js/ui/settings.js b/app/js/ui/settings.js
index 55722035..d0043daa 100644
--- a/app/js/ui/settings.js
+++ b/app/js/ui/settings.js
@@ -659,7 +659,6 @@ window.onload = function () {
 	checkSpotify();
 	voiceSettingLoad();
 	oksload();
-	npprovider();
 	ctLoad()
 };
 
diff --git a/app/package.json b/app/package.json
index 5d3d8317..930b2a83 100644
--- a/app/package.json
+++ b/app/package.json
@@ -50,6 +50,7 @@
   "license": "GPL-3.0",
   "dependencies": {
     "electron-dl": "^1.14.0",
+    "@fortawesome/fontawesome-free": "^5.10.1",
     "jimp": "^0.6.4",
     "jquery": "^3.4.1",
     "json5": "^2.1.0",
@@ -64,7 +65,6 @@
     "font-manager": "^0.3.0"
   },
   "devDependencies": {
-    "@fortawesome/fontawesome-free": "^5.10.1",
     "electron": "^6.0.0",
     "electron-builder": "^21.1.5",
     "readline-sync": "1.4.10"
diff --git a/app/view/bg/acct.html b/app/view/bg/acct.html
index e7c368df..fd348494 100644
--- a/app/view/bg/acct.html
+++ b/app/view/bg/acct.html
@@ -7,10 +7,9 @@
       <link href="../../node_modules/materialize-css/dist/css/materialize.css" type="text/css" rel="stylesheet">
       <link href="../../css/themes.css" type="text/css" rel="stylesheet">
       <link href="../../css/master.css" type="text/css" rel="stylesheet">
-      <link href='../../css/font-awesome.css' rel='stylesheet' type='text/css'>
-      <link href='../../css/tl.css' rel='stylesheet' type='text/css'>
-      <link href='../../css/userdata.css' rel='stylesheet' type='text/css'>
-      <link href="https://fonts.googleapis.com/icon?family=Material+Icons|Open+Sans:300" rel="stylesheet">
+      <link href="../../css/tl.css" rel="stylesheet" type="text/css">
+      <link href="../../css/userdata.css" rel="stylesheet" type="text/css">
+      <link href="../../node_modules/@fortawesome/fontawesome-free/css/all.min.css" type="text/css" rel="stylesheet">
       <style>
             .acct {
                   display: flex;
diff --git a/app/view/bg/setting.html b/app/view/bg/setting.html
index a32774cb..7076dbed 100644
--- a/app/view/bg/setting.html
+++ b/app/view/bg/setting.html
@@ -15,8 +15,7 @@
 	<link href="../../css/themes.css" type="text/css" rel="stylesheet">
 	<link href="../../css/pickr.css" type="text/css" rel="stylesheet">
 	<link href="../../css/master.css" type="text/css" rel="stylesheet">
-	<link href='../../css/font-awesome.css' rel='stylesheet' type='text/css'>
-	<link href="https://fonts.googleapis.com/icon?family=Material+Icons|Open+Sans:300" rel="stylesheet">
+	<link href="../../node_modules/@fortawesome/fontawesome-free/css/all.min.css" type="text/css" rel="stylesheet">
 	<meta charset="utf-8">
 	<style>
 		input {
@@ -329,7 +328,7 @@
 		</li>
 		<li>
 			<div class="collapsible-header">
-				<i class="fa fa-spotify"></i>Spotify and NowPlaying Preferences
+				<i class="fab fa-spotify"></i>Spotify and NowPlaying Preferences
 			</div>
 			<div class="collapsible-body">
 				<br><br>
@@ -445,7 +444,7 @@
 	<a href="https://docs.thedesk.top" class="btn waves-effect blue darken-2" style="width:100%; max-width:500px;"><i
 			class="material-icons left">list</i>Help/Docs</a>
 	<a href="https://github.com/cutls/TheDesk" class="btn waves-effect black lighten-2"
-		style="width:100%; max-width:500px;"><i class="fa fa-github left"></i>GitHub</a>
+		style="width:100%; max-width:500px;"><i class="fab fa-github left"></i>GitHub</a>
 	<a href="index.html?mode=user&code=Cutls@cutls.com" class="btn waves-effect blue lighten-2"
 		style="width:100%; max-width:500px;"><img src="../../img/desk_full.svg" class="left" width="25"
 			style="padding-top:5px;">Developer: Cutls@cutls.com</a>
diff --git a/app/view/bg/update.html b/app/view/bg/update.html
index 02fdbd42..73f68c06 100644
--- a/app/view/bg/update.html
+++ b/app/view/bg/update.html
@@ -5,7 +5,6 @@
     <title>Update - TheDesk</title>
     <link href="../../node_modules/materialize-css/dist/css/materialize.css" type="text/css" rel="stylesheet">
     <link href="../../css/master.css" type="text/css" rel="stylesheet">
-    <link href="https://fonts.googleapis.com/icon?family=Material+Icons|Open+Sans:300" rel="stylesheet">
     <meta charset="utf-8">
     <!--
     <script type="text/javascript">
diff --git a/app/view/cs/acct.html b/app/view/cs/acct.html
index eae35be5..25f178d6 100644
--- a/app/view/cs/acct.html
+++ b/app/view/cs/acct.html
@@ -7,10 +7,9 @@
       <link href="../../node_modules/materialize-css/dist/css/materialize.css" type="text/css" rel="stylesheet">
       <link href="../../css/themes.css" type="text/css" rel="stylesheet">
       <link href="../../css/master.css" type="text/css" rel="stylesheet">
-      <link href='../../css/font-awesome.css' rel='stylesheet' type='text/css'>
-      <link href='../../css/tl.css' rel='stylesheet' type='text/css'>
-      <link href='../../css/userdata.css' rel='stylesheet' type='text/css'>
-      <link href="https://fonts.googleapis.com/icon?family=Material+Icons|Open+Sans:300" rel="stylesheet">
+      <link href="../../css/tl.css" rel="stylesheet" type="text/css">
+      <link href="../../css/userdata.css" rel="stylesheet" type="text/css">
+      <link href="../../node_modules/@fortawesome/fontawesome-free/css/all.min.css" type="text/css" rel="stylesheet">
       <style>
             .acct {
                   display: flex;
diff --git a/app/view/cs/setting.html b/app/view/cs/setting.html
index 0469ba31..0e24164b 100644
--- a/app/view/cs/setting.html
+++ b/app/view/cs/setting.html
@@ -15,8 +15,7 @@
 	<link href="../../css/themes.css" type="text/css" rel="stylesheet">
 	<link href="../../css/pickr.css" type="text/css" rel="stylesheet">
 	<link href="../../css/master.css" type="text/css" rel="stylesheet">
-	<link href='../../css/font-awesome.css' rel='stylesheet' type='text/css'>
-	<link href="https://fonts.googleapis.com/icon?family=Material+Icons|Open+Sans:300" rel="stylesheet">
+	<link href="../../node_modules/@fortawesome/fontawesome-free/css/all.min.css" type="text/css" rel="stylesheet">
 	<meta charset="utf-8">
 	<style>
 		input {
@@ -329,7 +328,7 @@
 		</li>
 		<li>
 			<div class="collapsible-header">
-				<i class="fa fa-spotify"></i>Spotify and NowPlaying Preferences
+				<i class="fab fa-spotify"></i>Spotify and NowPlaying Preferences
 			</div>
 			<div class="collapsible-body">
 				<br><br>
@@ -445,7 +444,7 @@
 	<a href="https://docs.thedesk.top" class="btn waves-effect blue darken-2" style="width:100%; max-width:500px;"><i
 			class="material-icons left">list</i>Help/Docs</a>
 	<a href="https://github.com/cutls/TheDesk" class="btn waves-effect black lighten-2"
-		style="width:100%; max-width:500px;"><i class="fa fa-github left"></i>GitHub</a>
+		style="width:100%; max-width:500px;"><i class="fab fa-github left"></i>GitHub</a>
 	<a href="index.html?mode=user&code=Cutls@cutls.com" class="btn waves-effect blue lighten-2"
 		style="width:100%; max-width:500px;"><img src="../../img/desk_full.svg" class="left" width="25"
 			style="padding-top:5px;">Developer: Cutls@cutls.com</a>
diff --git a/app/view/cs/update.html b/app/view/cs/update.html
index b020ab2c..ae95ed83 100644
--- a/app/view/cs/update.html
+++ b/app/view/cs/update.html
@@ -5,7 +5,6 @@
     <title>Update - TheDesk</title>
     <link href="../../node_modules/materialize-css/dist/css/materialize.css" type="text/css" rel="stylesheet">
     <link href="../../css/master.css" type="text/css" rel="stylesheet">
-    <link href="https://fonts.googleapis.com/icon?family=Material+Icons|Open+Sans:300" rel="stylesheet">
     <meta charset="utf-8">
     <!--
     <script type="text/javascript">
diff --git a/app/view/de/acct.html b/app/view/de/acct.html
index b6005931..86b81670 100644
--- a/app/view/de/acct.html
+++ b/app/view/de/acct.html
@@ -7,10 +7,9 @@
       <link href="../../node_modules/materialize-css/dist/css/materialize.css" type="text/css" rel="stylesheet">
       <link href="../../css/themes.css" type="text/css" rel="stylesheet">
       <link href="../../css/master.css" type="text/css" rel="stylesheet">
-      <link href='../../css/font-awesome.css' rel='stylesheet' type='text/css'>
-      <link href='../../css/tl.css' rel='stylesheet' type='text/css'>
-      <link href='../../css/userdata.css' rel='stylesheet' type='text/css'>
-      <link href="https://fonts.googleapis.com/icon?family=Material+Icons|Open+Sans:300" rel="stylesheet">
+      <link href="../../css/tl.css" rel="stylesheet" type="text/css">
+      <link href="../../css/userdata.css" rel="stylesheet" type="text/css">
+      <link href="../../node_modules/@fortawesome/fontawesome-free/css/all.min.css" type="text/css" rel="stylesheet">
       <style>
             .acct {
                   display: flex;
diff --git a/app/view/de/setting.html b/app/view/de/setting.html
index eed85bb2..9045db1d 100644
--- a/app/view/de/setting.html
+++ b/app/view/de/setting.html
@@ -15,8 +15,7 @@
 	<link href="../../css/themes.css" type="text/css" rel="stylesheet">
 	<link href="../../css/pickr.css" type="text/css" rel="stylesheet">
 	<link href="../../css/master.css" type="text/css" rel="stylesheet">
-	<link href='../../css/font-awesome.css' rel='stylesheet' type='text/css'>
-	<link href="https://fonts.googleapis.com/icon?family=Material+Icons|Open+Sans:300" rel="stylesheet">
+	<link href="../../node_modules/@fortawesome/fontawesome-free/css/all.min.css" type="text/css" rel="stylesheet">
 	<meta charset="utf-8">
 	<style>
 		input {
@@ -329,7 +328,7 @@
 		</li>
 		<li>
 			<div class="collapsible-header">
-				<i class="fa fa-spotify"></i>Spotify und NowPlaying Einstellungen
+				<i class="fab fa-spotify"></i>Spotify und NowPlaying Einstellungen
 			</div>
 			<div class="collapsible-body">
 				<br><br>
@@ -445,7 +444,7 @@
 	<a href="https://docs.thedesk.top" class="btn waves-effect blue darken-2" style="width:100%; max-width:500px;"><i
 			class="material-icons left">list</i>Hilfe/Docs</a>
 	<a href="https://github.com/cutls/TheDesk" class="btn waves-effect black lighten-2"
-		style="width:100%; max-width:500px;"><i class="fa fa-github left"></i>GitHub</a>
+		style="width:100%; max-width:500px;"><i class="fab fa-github left"></i>GitHub</a>
 	<a href="index.html?mode=user&code=Cutls@cutls.com" class="btn waves-effect blue lighten-2"
 		style="width:100%; max-width:500px;"><img src="../../img/desk_full.svg" class="left" width="25"
 			style="padding-top:5px;">Developer: Cutls@cutls.com</a>
diff --git a/app/view/de/update.html b/app/view/de/update.html
index b1312f0d..0d2b975d 100644
--- a/app/view/de/update.html
+++ b/app/view/de/update.html
@@ -5,7 +5,6 @@
     <title>Update - TheDesk</title>
     <link href="../../node_modules/materialize-css/dist/css/materialize.css" type="text/css" rel="stylesheet">
     <link href="../../css/master.css" type="text/css" rel="stylesheet">
-    <link href="https://fonts.googleapis.com/icon?family=Material+Icons|Open+Sans:300" rel="stylesheet">
     <meta charset="utf-8">
     <!--
     <script type="text/javascript">
diff --git a/app/view/en/acct.html b/app/view/en/acct.html
index e804cf8d..b1b81efa 100644
--- a/app/view/en/acct.html
+++ b/app/view/en/acct.html
@@ -7,10 +7,9 @@
       <link href="../../node_modules/materialize-css/dist/css/materialize.css" type="text/css" rel="stylesheet">
       <link href="../../css/themes.css" type="text/css" rel="stylesheet">
       <link href="../../css/master.css" type="text/css" rel="stylesheet">
-      <link href='../../css/font-awesome.css' rel='stylesheet' type='text/css'>
-      <link href='../../css/tl.css' rel='stylesheet' type='text/css'>
-      <link href='../../css/userdata.css' rel='stylesheet' type='text/css'>
-      <link href="https://fonts.googleapis.com/icon?family=Material+Icons|Open+Sans:300" rel="stylesheet">
+      <link href="../../css/tl.css" rel="stylesheet" type="text/css">
+      <link href="../../css/userdata.css" rel="stylesheet" type="text/css">
+      <link href="../../node_modules/@fortawesome/fontawesome-free/css/all.min.css" type="text/css" rel="stylesheet">
       <style>
             .acct {
                   display: flex;
diff --git a/app/view/en/setting.html b/app/view/en/setting.html
index 758c4460..7c0ddc26 100644
--- a/app/view/en/setting.html
+++ b/app/view/en/setting.html
@@ -15,8 +15,7 @@
 	<link href="../../css/themes.css" type="text/css" rel="stylesheet">
 	<link href="../../css/pickr.css" type="text/css" rel="stylesheet">
 	<link href="../../css/master.css" type="text/css" rel="stylesheet">
-	<link href='../../css/font-awesome.css' rel='stylesheet' type='text/css'>
-	<link href="https://fonts.googleapis.com/icon?family=Material+Icons|Open+Sans:300" rel="stylesheet">
+	<link href="../../node_modules/@fortawesome/fontawesome-free/css/all.min.css" type="text/css" rel="stylesheet">
 	<meta charset="utf-8">
 	<style>
 		input {
@@ -329,7 +328,7 @@
 		</li>
 		<li>
 			<div class="collapsible-header">
-				<i class="fa fa-spotify"></i>Spotify and NowPlaying Preferences
+				<i class="fab fa-spotify"></i>Spotify and NowPlaying Preferences
 			</div>
 			<div class="collapsible-body">
 				<br><br>
@@ -445,7 +444,7 @@
 	<a href="https://docs.thedesk.top" class="btn waves-effect blue darken-2" style="width:100%; max-width:500px;"><i
 			class="material-icons left">list</i>Help/Docs</a>
 	<a href="https://github.com/cutls/TheDesk" class="btn waves-effect black lighten-2"
-		style="width:100%; max-width:500px;"><i class="fa fa-github left"></i>GitHub</a>
+		style="width:100%; max-width:500px;"><i class="fab fa-github left"></i>GitHub</a>
 	<a href="index.html?mode=user&code=Cutls@cutls.com" class="btn waves-effect blue lighten-2"
 		style="width:100%; max-width:500px;"><img src="../../img/desk_full.svg" class="left" width="25"
 			style="padding-top:5px;">Developer: Cutls@cutls.com</a>
diff --git a/app/view/en/update.html b/app/view/en/update.html
index 9626120a..69594eea 100644
--- a/app/view/en/update.html
+++ b/app/view/en/update.html
@@ -5,7 +5,6 @@
     <title>Update - TheDesk</title>
     <link href="../../node_modules/materialize-css/dist/css/materialize.css" type="text/css" rel="stylesheet">
     <link href="../../css/master.css" type="text/css" rel="stylesheet">
-    <link href="https://fonts.googleapis.com/icon?family=Material+Icons|Open+Sans:300" rel="stylesheet">
     <meta charset="utf-8">
     <!--
     <script type="text/javascript">
diff --git a/app/view/ja/acct.html b/app/view/ja/acct.html
index 72dc501b..38c551fb 100644
--- a/app/view/ja/acct.html
+++ b/app/view/ja/acct.html
@@ -7,10 +7,9 @@
       <link href="../../node_modules/materialize-css/dist/css/materialize.css" type="text/css" rel="stylesheet">
       <link href="../../css/themes.css" type="text/css" rel="stylesheet">
       <link href="../../css/master.css" type="text/css" rel="stylesheet">
-      <link href='../../css/font-awesome.css' rel='stylesheet' type='text/css'>
-      <link href='../../css/tl.css' rel='stylesheet' type='text/css'>
-      <link href='../../css/userdata.css' rel='stylesheet' type='text/css'>
-      <link href="https://fonts.googleapis.com/icon?family=Material+Icons|Open+Sans:300" rel="stylesheet">
+      <link href="../../css/tl.css" rel="stylesheet" type="text/css">
+      <link href="../../css/userdata.css" rel="stylesheet" type="text/css">
+      <link href="../../node_modules/@fortawesome/fontawesome-free/css/all.min.css" type="text/css" rel="stylesheet">
       <style>
             .acct {
                   display: flex;
diff --git a/app/view/ja/setting.html b/app/view/ja/setting.html
index 3b2edeb2..19a4e0e2 100644
--- a/app/view/ja/setting.html
+++ b/app/view/ja/setting.html
@@ -15,8 +15,7 @@
 	<link href="../../css/themes.css" type="text/css" rel="stylesheet">
 	<link href="../../css/pickr.css" type="text/css" rel="stylesheet">
 	<link href="../../css/master.css" type="text/css" rel="stylesheet">
-	<link href='../../css/font-awesome.css' rel='stylesheet' type='text/css'>
-	<link href="https://fonts.googleapis.com/icon?family=Material+Icons|Open+Sans:300" rel="stylesheet">
+	<link href="../../node_modules/@fortawesome/fontawesome-free/css/all.min.css" type="text/css" rel="stylesheet">
 	<meta charset="utf-8">
 	<style>
 		input {
@@ -329,7 +328,7 @@
 		</li>
 		<li>
 			<div class="collapsible-header">
-				<i class="fa fa-spotify"></i>SpotifyとNowPlayingの設定
+				<i class="fab fa-spotify"></i>SpotifyとNowPlayingの設定
 			</div>
 			<div class="collapsible-body">
 				<br><br>
@@ -445,7 +444,7 @@
 	<a href="https://docs.thedesk.top" class="btn waves-effect blue darken-2" style="width:100%; max-width:500px;"><i
 			class="material-icons left">list</i>ヘルプ/Docs</a>
 	<a href="https://github.com/cutls/TheDesk" class="btn waves-effect black lighten-2"
-		style="width:100%; max-width:500px;"><i class="fa fa-github left"></i>GitHub</a>
+		style="width:100%; max-width:500px;"><i class="fab fa-github left"></i>GitHub</a>
 	<a href="index.html?mode=user&code=Cutls@cutls.com" class="btn waves-effect blue lighten-2"
 		style="width:100%; max-width:500px;"><img src="../../img/desk_full.svg" class="left" width="25"
 			style="padding-top:5px;">Developer: Cutls@cutls.com</a>
diff --git a/app/view/ja/update.html b/app/view/ja/update.html
index 9176eedb..fdcc270e 100644
--- a/app/view/ja/update.html
+++ b/app/view/ja/update.html
@@ -5,7 +5,6 @@
     <title>Update - TheDesk</title>
     <link href="../../node_modules/materialize-css/dist/css/materialize.css" type="text/css" rel="stylesheet">
     <link href="../../css/master.css" type="text/css" rel="stylesheet">
-    <link href="https://fonts.googleapis.com/icon?family=Material+Icons|Open+Sans:300" rel="stylesheet">
     <meta charset="utf-8">
     <!--
     <script type="text/javascript">
diff --git a/app/view/make/acct.sample.html b/app/view/make/acct.sample.html
index 9481b860..1e4aa144 100644
--- a/app/view/make/acct.sample.html
+++ b/app/view/make/acct.sample.html
@@ -7,10 +7,9 @@
       <link href="../../node_modules/materialize-css/dist/css/materialize.css" type="text/css" rel="stylesheet">
       <link href="../../css/themes.css" type="text/css" rel="stylesheet">
       <link href="../../css/master.css" type="text/css" rel="stylesheet">
-      <link href='../../css/font-awesome.css' rel='stylesheet' type='text/css'>
-      <link href='../../css/tl.css' rel='stylesheet' type='text/css'>
-      <link href='../../css/userdata.css' rel='stylesheet' type='text/css'>
-      <link href="https://fonts.googleapis.com/icon?family=Material+Icons|Open+Sans:300" rel="stylesheet">
+      <link href="../../css/tl.css" rel="stylesheet" type="text/css">
+      <link href="../../css/userdata.css" rel="stylesheet" type="text/css">
+      <link href="../../node_modules/@fortawesome/fontawesome-free/css/all.min.css" type="text/css" rel="stylesheet">
       <style>
             .acct {
                   display: flex;
diff --git a/app/view/make/setting.sample.html b/app/view/make/setting.sample.html
index a88c1f6a..fa55e80a 100644
--- a/app/view/make/setting.sample.html
+++ b/app/view/make/setting.sample.html
@@ -15,8 +15,7 @@
 	<link href="../../css/themes.css" type="text/css" rel="stylesheet">
 	<link href="../../css/pickr.css" type="text/css" rel="stylesheet">
 	<link href="../../css/master.css" type="text/css" rel="stylesheet">
-	<link href='../../css/font-awesome.css' rel='stylesheet' type='text/css'>
-	<link href="https://fonts.googleapis.com/icon?family=Material+Icons|Open+Sans:300" rel="stylesheet">
+	<link href="../../node_modules/@fortawesome/fontawesome-free/css/all.min.css" type="text/css" rel="stylesheet">
 	<meta charset="utf-8">
 	<style>
 		input {
@@ -329,7 +328,7 @@
 		</li>
 		<li>
 			<div class="collapsible-header">
-				<i class="fa fa-spotify"></i>@@spotify@@
+				<i class="fab fa-spotify"></i>@@spotify@@
 			</div>
 			<div class="collapsible-body">
 				<br><br>
@@ -445,7 +444,7 @@
 	<a href="https://docs.thedesk.top" class="btn waves-effect blue darken-2" style="width:100%; max-width:500px;"><i
 			class="material-icons left">list</i>@@help@@/Docs</a>
 	<a href="https://github.com/cutls/TheDesk" class="btn waves-effect black lighten-2"
-		style="width:100%; max-width:500px;"><i class="fa fa-github left"></i>GitHub</a>
+		style="width:100%; max-width:500px;"><i class="fab fa-github left"></i>GitHub</a>
 	<a href="index.html?mode=user&code=Cutls@cutls.com" class="btn waves-effect blue lighten-2"
 		style="width:100%; max-width:500px;"><img src="../../img/desk_full.svg" class="left" width="25"
 			style="padding-top:5px;">Developer: Cutls@cutls.com</a>
diff --git a/app/view/make/update.sample.html b/app/view/make/update.sample.html
index 7711399f..a1209142 100644
--- a/app/view/make/update.sample.html
+++ b/app/view/make/update.sample.html
@@ -5,7 +5,6 @@
     <title>Update - TheDesk</title>
     <link href="../../node_modules/materialize-css/dist/css/materialize.css" type="text/css" rel="stylesheet">
     <link href="../../css/master.css" type="text/css" rel="stylesheet">
-    <link href="https://fonts.googleapis.com/icon?family=Material+Icons|Open+Sans:300" rel="stylesheet">
     <meta charset="utf-8">
     @@comment-start@@
     <script type="text/javascript">
diff --git a/app/view/ps/acct.html b/app/view/ps/acct.html
index 70d9d3e2..b03eafbe 100644
--- a/app/view/ps/acct.html
+++ b/app/view/ps/acct.html
@@ -7,10 +7,9 @@
       <link href="../../node_modules/materialize-css/dist/css/materialize.css" type="text/css" rel="stylesheet">
       <link href="../../css/themes.css" type="text/css" rel="stylesheet">
       <link href="../../css/master.css" type="text/css" rel="stylesheet">
-      <link href='../../css/font-awesome.css' rel='stylesheet' type='text/css'>
-      <link href='../../css/tl.css' rel='stylesheet' type='text/css'>
-      <link href='../../css/userdata.css' rel='stylesheet' type='text/css'>
-      <link href="https://fonts.googleapis.com/icon?family=Material+Icons|Open+Sans:300" rel="stylesheet">
+      <link href="../../css/tl.css" rel="stylesheet" type="text/css">
+      <link href="../../css/userdata.css" rel="stylesheet" type="text/css">
+      <link href="../../node_modules/@fortawesome/fontawesome-free/css/all.min.css" type="text/css" rel="stylesheet">
       <style>
             .acct {
                   display: flex;
diff --git a/app/view/ps/setting.html b/app/view/ps/setting.html
index 50f24272..f25b7951 100644
--- a/app/view/ps/setting.html
+++ b/app/view/ps/setting.html
@@ -15,8 +15,7 @@
 	<link href="../../css/themes.css" type="text/css" rel="stylesheet">
 	<link href="../../css/pickr.css" type="text/css" rel="stylesheet">
 	<link href="../../css/master.css" type="text/css" rel="stylesheet">
-	<link href='../../css/font-awesome.css' rel='stylesheet' type='text/css'>
-	<link href="https://fonts.googleapis.com/icon?family=Material+Icons|Open+Sans:300" rel="stylesheet">
+	<link href="../../node_modules/@fortawesome/fontawesome-free/css/all.min.css" type="text/css" rel="stylesheet">
 	<meta charset="utf-8">
 	<style>
 		input {
@@ -329,7 +328,7 @@
 		</li>
 		<li>
 			<div class="collapsible-header">
-				<i class="fa fa-spotify"></i>crwdns624:0crwdne624:0
+				<i class="fab fa-spotify"></i>crwdns624:0crwdne624:0
 			</div>
 			<div class="collapsible-body">
 				<br><br>
@@ -445,7 +444,7 @@
 	<a href="https://docs.thedesk.top" class="btn waves-effect blue darken-2" style="width:100%; max-width:500px;"><i
 			class="material-icons left">list</i>crwdns665:0crwdne665:0/Docs</a>
 	<a href="https://github.com/cutls/TheDesk" class="btn waves-effect black lighten-2"
-		style="width:100%; max-width:500px;"><i class="fa fa-github left"></i>GitHub</a>
+		style="width:100%; max-width:500px;"><i class="fab fa-github left"></i>GitHub</a>
 	<a href="index.html?mode=user&code=Cutls@cutls.com" class="btn waves-effect blue lighten-2"
 		style="width:100%; max-width:500px;"><img src="../../img/desk_full.svg" class="left" width="25"
 			style="padding-top:5px;">Developer: Cutls@cutls.com</a>
diff --git a/app/view/ps/update.html b/app/view/ps/update.html
index 1b8d4abc..07e31caa 100644
--- a/app/view/ps/update.html
+++ b/app/view/ps/update.html
@@ -5,7 +5,6 @@
     <title>Update - TheDesk</title>
     <link href="../../node_modules/materialize-css/dist/css/materialize.css" type="text/css" rel="stylesheet">
     <link href="../../css/master.css" type="text/css" rel="stylesheet">
-    <link href="https://fonts.googleapis.com/icon?family=Material+Icons|Open+Sans:300" rel="stylesheet">
     <meta charset="utf-8">
     
     <script type="text/javascript">