diff --git a/package.json b/package.json
index 6039a17d3..adc019461 100644
--- a/package.json
+++ b/package.json
@@ -81,9 +81,6 @@
     "@burner-wallet/burner-connect-provider": "^0.1.1",
     "@daostack/arc.js": "2.0.0-experimental.54",
     "@dorgtech/daocreator-ui-experimental": "1.1.13",
-    "@fortawesome/fontawesome-svg-core": "^1.2.10",
-    "@fortawesome/free-brands-svg-icons": "^5.6.1",
-    "@fortawesome/react-fontawesome": "^0.1.3",
     "@portis/web3": "^2.0.0-beta.56",
     "@sentry/browser": "^5.0.8",
     "@toruslabs/torus-embed": "^1.8.1",
diff --git a/src/assets/images/Icon/social/github.svg b/src/assets/images/Icon/social/github.svg
new file mode 100644
index 000000000..e6e39c90d
--- /dev/null
+++ b/src/assets/images/Icon/social/github.svg
@@ -0,0 +1 @@
+<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>GitHub icon</title><path d="M12 .297c-6.63 0-12 5.373-12 12 0 5.303 3.438 9.8 8.205 11.385.6.113.82-.258.82-.577 0-.285-.01-1.04-.015-2.04-3.338.724-4.042-1.61-4.042-1.61C4.422 18.07 3.633 17.7 3.633 17.7c-1.087-.744.084-.729.084-.729 1.205.084 1.838 1.236 1.838 1.236 1.07 1.835 2.809 1.305 3.495.998.108-.776.417-1.305.76-1.605-2.665-.3-5.466-1.332-5.466-5.93 0-1.31.465-2.38 1.235-3.22-.135-.303-.54-1.523.105-3.176 0 0 1.005-.322 3.3 1.23.96-.267 1.98-.399 3-.405 1.02.006 2.04.138 3 .405 2.28-1.552 3.285-1.23 3.285-1.23.645 1.653.24 2.873.12 3.176.765.84 1.23 1.91 1.23 3.22 0 4.61-2.805 5.625-5.475 5.92.42.36.81 1.096.81 2.22 0 1.606-.015 2.896-.015 3.286 0 .315.21.69.825.57C20.565 22.092 24 17.592 24 12.297c0-6.627-5.373-12-12-12"/></svg>
diff --git a/src/assets/images/Icon/social/twitter.svg b/src/assets/images/Icon/social/twitter.svg
old mode 100644
new mode 100755
index 6cb3000e1..6b421ee91
--- a/src/assets/images/Icon/social/twitter.svg
+++ b/src/assets/images/Icon/social/twitter.svg
@@ -1,14 +1,20 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <defs>
-        <path id="a" d="M0 .276h39.721v39.42H0z"/>
-    </defs>
-    <g fill="none" fill-rule="evenodd">
-        <g transform="translate(0 .027)">
-            <mask id="b" fill="#fff">
-                <use xlink:href="#a"/>
-            </mask>
-            <path fill="#2AA8DF" d="M19.86 39.697C8.893 39.697 0 30.872 0 19.987 0 9.1 8.892.276 19.86.276c10.97 0 19.861 8.824 19.861 19.71 0 10.885-8.892 19.71-19.86 19.71" mask="url(#b)"/>
-        </g>
-        <path fill="#FEFEFE" d="M31.235 13.012a9.382 9.382 0 0 1-2.68.73 4.648 4.648 0 0 0 2.052-2.563c-.901.53-1.9.916-2.963 1.124a4.677 4.677 0 0 0-3.408-1.463c-2.577 0-4.667 2.074-4.667 4.632 0 .364.042.716.12 1.055a13.279 13.279 0 0 1-9.62-4.84 4.62 4.62 0 0 0 1.444 6.185 4.675 4.675 0 0 1-2.113-.58v.059c0 2.244 1.61 4.116 3.744 4.541a4.725 4.725 0 0 1-2.108.08 4.668 4.668 0 0 0 4.36 3.217 9.408 9.408 0 0 1-5.797 1.983c-.377 0-.748-.023-1.113-.065a13.293 13.293 0 0 0 7.156 2.08c8.584 0 13.278-7.057 13.278-13.178 0-.2-.005-.4-.013-.6a9.47 9.47 0 0 0 2.328-2.397"/>
-    </g>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 20.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 400 400" style="enable-background:new 0 0 400 400;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#1DA1F2;}
+	.st1{fill:#FFFFFF;}
+</style>
+<g id="Dark_Blue">
+	<circle class="st0" cx="200" cy="200" r="200"/>
+</g>
+<g id="Logo__x2014__FIXED">
+	<path class="st1" d="M163.4,305.5c88.7,0,137.2-73.5,137.2-137.2c0-2.1,0-4.2-0.1-6.2c9.4-6.8,17.6-15.3,24.1-25
+		c-8.6,3.8-17.9,6.4-27.7,7.6c10-6,17.6-15.4,21.2-26.7c-9.3,5.5-19.6,9.5-30.6,11.7c-8.8-9.4-21.3-15.2-35.2-15.2
+		c-26.6,0-48.2,21.6-48.2,48.2c0,3.8,0.4,7.5,1.3,11c-40.1-2-75.6-21.2-99.4-50.4c-4.1,7.1-6.5,15.4-6.5,24.2
+		c0,16.7,8.5,31.5,21.5,40.1c-7.9-0.2-15.3-2.4-21.8-6c0,0.2,0,0.4,0,0.6c0,23.4,16.6,42.8,38.7,47.3c-4,1.1-8.3,1.7-12.7,1.7
+		c-3.1,0-6.1-0.3-9.1-0.9c6.1,19.2,23.9,33.1,45,33.5c-16.5,12.9-37.3,20.6-59.9,20.6c-3.9,0-7.7-0.2-11.5-0.7
+		C110.8,297.5,136.2,305.5,163.4,305.5"/>
+</g>
 </svg>
diff --git a/src/components/Account/Account.scss b/src/components/Account/Account.scss
index aade9aecc..f38fa88e0 100644
--- a/src/components/Account/Account.scss
+++ b/src/components/Account/Account.scss
@@ -284,8 +284,11 @@ a.accountName {
 }
 
 .socialButtonAuthenticated {
+  display: flex;
   .icon {
-    color: #76c9de;
+    width: 20px;
+    height: 20px;
+    margin-right: 10px;
   }
 }
 
diff --git a/src/components/Account/AccountPopup.tsx b/src/components/Account/AccountPopup.tsx
index 89ded5259..210006fa1 100644
--- a/src/components/Account/AccountPopup.tsx
+++ b/src/components/Account/AccountPopup.tsx
@@ -1,6 +1,5 @@
 import { Address, IDAOState, Member, IMemberState } from "@daostack/arc.js";
 import { getArc } from "arc";
-import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { getProfile } from "actions/profilesActions";
 import AccountImage from "components/Account/AccountImage";
 import AccountProfileName from "components/Account/AccountProfileName";
@@ -80,11 +79,11 @@ class AccountPopup extends React.Component<IProps, null> {
               <span>
                 {profile.socialURLs.twitter ?
                   <a href={"https://twitter.com/" + profile.socialURLs.twitter.username} className={css.socialButton} target="_blank" rel="noopener noreferrer">
-                    <FontAwesomeIcon icon={["fab", "twitter"]} className={css.icon} />
+                    <img src='/assets/images/Icon/social/twitter.svg' className={css.icon} />
                   </a> : ""}
                 {profile.socialURLs.github ?
                   <a href={"https://github.com/" + profile.socialURLs.github.username} className={css.socialButton} target="_blank" rel="noopener noreferrer">
-                    <FontAwesomeIcon icon={["fab", "github"]} className={css.icon} />
+                    <img src='/assets/images/Icon/social/github.svg' className={css.icon} />
                   </a> : ""}
               </span>
             }
diff --git a/src/components/Account/AccountProfilePage.tsx b/src/components/Account/AccountProfilePage.tsx
index 8aa5861a9..6fc2653be 100644
--- a/src/components/Account/AccountProfilePage.tsx
+++ b/src/components/Account/AccountProfilePage.tsx
@@ -1,6 +1,4 @@
 import { IDAOState, IMemberState, DAO, Member } from "@daostack/arc.js";
-import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
-
 import BN = require("bn.js");
 import { getProfile, updateProfile } from "actions/profilesActions";
 import { enableWalletProvider, getArc, getAccountIsEnabled } from "arc";
@@ -282,11 +280,11 @@ class AccountProfilePage extends React.Component<IProps, IState> {
                         }
 
                         <a href={accountProfile.socialURLs.twitter ? "https://twitter.com/" + accountProfile.socialURLs.twitter.username : "https://3box.io/" + accountAddress} className={css.socialButtonAuthenticated} target="_blank" rel="noopener noreferrer">
-                          <FontAwesomeIcon icon={["fab", "twitter"]} className={css.icon} /> {accountProfile.socialURLs.twitter ? "Verified as https://twitter.com/" + accountProfile.socialURLs.twitter.username : "Verify Twitter through 3box"}
+                          <img src='/assets/images/Icon/social/twitter.svg' className={css.icon} /> {accountProfile.socialURLs.twitter ? "Verified as https://twitter.com/" + accountProfile.socialURLs.twitter.username : "Verify Twitter through 3box"}
                         </a>
                         <br/>
                         <a href={accountProfile.socialURLs.github ? "https://github.com/" + accountProfile.socialURLs.github.username : "https://3box.io/" + accountAddress} className={css.socialButtonAuthenticated} target="_blank" rel="noopener noreferrer">
-                          <FontAwesomeIcon icon={["fab", "github"]} className={css.icon} /> {accountProfile.socialURLs.github ? "Verified as https://github.com/" + accountProfile.socialURLs.github.username : "Verify Github through 3box"}
+                          <img src='/assets/images/Icon/social/github.svg' className={css.icon} /> {accountProfile.socialURLs.github ? "Verified as https://github.com/" + accountProfile.socialURLs.github.username : "Verify Github through 3box"}
                         </a>
                       </div>
                     }
diff --git a/src/components/Dao/DaoMember.tsx b/src/components/Dao/DaoMember.tsx
index 5d09a2e7d..911e0a9f7 100644
--- a/src/components/Dao/DaoMember.tsx
+++ b/src/components/Dao/DaoMember.tsx
@@ -1,6 +1,5 @@
 import BN = require("bn.js");
 import { IDAOState, IMemberState, Member } from "@daostack/arc.js";
-import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import AccountImage from "components/Account/AccountImage";
 import AccountProfileName from "components/Account/AccountProfileName";
 import Reputation from "components/Account/Reputation";
@@ -67,11 +66,11 @@ class DaoMember extends React.Component<IProps, null> {
                     <span>
                       { profile.socialURLs.twitter ?
                         <span onClick={this.openSocial("https://twitter.com/" + profile.socialURLs.twitter.username)} className={css.socialButton}>
-                          <FontAwesomeIcon icon={["fab", "twitter"]} className={css.icon} />
+                          <img src='/assets/images/Icon/social/twitter.svg' className={css.icon} />
                         </span> : ""}
                       { profile.socialURLs.github ?
                         <span onClick={this.openSocial("https://github.com/" + profile.socialURLs.github.username)} className={css.socialButton}>
-                          <FontAwesomeIcon icon={["fab", "github"]} className={css.icon} />
+                          <img src='/assets/images/Icon/social/github.svg' className={css.icon} />
                         </span> : ""}
                     </span>
                     : ""
diff --git a/src/index.tsx b/src/index.tsx
index e81137f5e..5953a86f0 100644
--- a/src/index.tsx
+++ b/src/index.tsx
@@ -1,6 +1,3 @@
-import { library } from "@fortawesome/fontawesome-svg-core";
-import { faGithub } from "@fortawesome/free-brands-svg-icons/faGithub";
-import { faTwitter } from "@fortawesome/free-brands-svg-icons/faTwitter";
 import { init as sentryInit } from "@sentry/browser";
 import * as Mixpanel from "mixpanel-browser";
 import * as React from "react";
@@ -13,8 +10,6 @@ import { App } from "./App";
 import "./assets/styles/global.scss";
 
 async function renderApp() {
-  // Add icons we want to use from FontAwesome
-  library.add(faGithub, faTwitter);
 
   if (process.env.NODE_ENV === "production") {
     sentryInit({