diff --git a/client/src/builtin/E2EE.js b/client/src/builtin/E2EE.js
index 8efeb151..a56d58e0 100644
--- a/client/src/builtin/E2EE.js
+++ b/client/src/builtin/E2EE.js
@@ -11,7 +11,7 @@
 import BuiltinModule from './BuiltinModule';
 import { WebpackModules, ReactComponents, MonkeyPatch, Patcher } from 'modules';
 import { VueInjector, Reflection } from 'ui';
-import EmoteComponent from './EmoteComponent.vue';
+import E2EEComponent from './E2EEComponent.vue';
 import aes256 from 'aes256';
 
 export default new class E2EE extends BuiltinModule {
@@ -30,11 +30,7 @@ export default new class E2EE extends BuiltinModule {
         if (!(retVal.props.children instanceof Array)) retVal.props.children = [retVal.props.children];
         const inner = retVal.props.children.find(child => child.props.className && child.props.className.includes('inner'));
 
-        inner.props.children.splice(0, 0, VueInjector.createReactElement(EmoteComponent, {
-            src: 'https://static-cdn.jtvnw.net/emoticons/v1/354/1.0',
-            name: '4Head',
-            hasWrapper: false
-        }, true));
+        inner.props.children.splice(0, 0, VueInjector.createReactElement(E2EEComponent, {}, true));
     }
 
     handleSubmit(component, args, retVal) {
diff --git a/client/src/builtin/E2EEComponent.vue b/client/src/builtin/E2EEComponent.vue
new file mode 100644
index 00000000..21660241
--- /dev/null
+++ b/client/src/builtin/E2EEComponent.vue
@@ -0,0 +1,29 @@
+/**
+ * BetterDiscord E2EE Component
+ * Copyright (c) 2015-present Jiiks/JsSucks - https://github.com/Jiiks / https://github.com/JsSucks
+ * All rights reserved.
+ * https://betterdiscord.net
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+*/
+
+<template>
+    <div class="bd-e2eeTaContainer">
+        <div class="bd-e2eeTaBtn bd-e2eeLock">
+            <MiLock v-tooltip="'E2EE'" />
+        </div>
+        <div class="bd-taDivider"></div>
+    </div>
+</template>
+
+<script>
+    import { MiLock } from '../ui/components/common/MaterialIcon';
+    export default {
+        components: { MiLock },
+        data() {
+            return {};
+        },
+        methods: {}
+    }
+</script>
diff --git a/client/src/styles/partials/bdsettings/e2ee.scss b/client/src/styles/partials/bdsettings/e2ee.scss
new file mode 100644
index 00000000..3fd121fe
--- /dev/null
+++ b/client/src/styles/partials/bdsettings/e2ee.scss
@@ -0,0 +1,24 @@
+.bd-e2eeTaContainer {
+    display: flex;
+
+    .bd-e2eeTaBtn {
+        padding: 10px;
+        display: flex;
+        flex: 1 1 auto;
+        flex-direction: row;
+        cursor: pointer;
+
+        &.bd-e2eeLock {
+            fill: #cc3e3e;
+        }
+    }
+
+    .bd-taDivider {
+        background-color: hsla(0,0%,100%,.1);
+        box-sizing: border-box;
+        height: 80%;
+        position: relative;
+        top: 10%;
+        width: 1px;
+    }
+}
diff --git a/client/src/styles/partials/bdsettings/index.scss b/client/src/styles/partials/bdsettings/index.scss
index fbadb580..69a04481 100644
--- a/client/src/styles/partials/bdsettings/index.scss
+++ b/client/src/styles/partials/bdsettings/index.scss
@@ -9,3 +9,4 @@
 @import './window-preferences';
 @import './kvp';
 @import './collection';
+@import './e2ee';
diff --git a/client/src/ui/components/common/MaterialIcon.js b/client/src/ui/components/common/MaterialIcon.js
index c47eb91f..9840b262 100644
--- a/client/src/ui/components/common/MaterialIcon.js
+++ b/client/src/ui/components/common/MaterialIcon.js
@@ -18,3 +18,4 @@ export { default as MiInfo } from './materialicons/Info.vue';
 export { default as MiWarning } from './materialicons/Warning.vue';
 export { default as MiSuccess } from './materialicons/Success.vue';
 export { default as AccountCircle } from './materialicons/AccountCircle.vue';
+export { default as MiLock } from './materialicons/Lock.vue';
diff --git a/client/src/ui/components/common/materialicons/Lock.vue b/client/src/ui/components/common/materialicons/Lock.vue
new file mode 100644
index 00000000..18ed6711
--- /dev/null
+++ b/client/src/ui/components/common/materialicons/Lock.vue
@@ -0,0 +1,27 @@
+/**
+ * BetterDiscord Material Design Icon
+ * Copyright (c) 2015-present Jiiks/JsSucks - https://github.com/Jiiks / https://github.com/JsSucks
+ * All rights reserved.
+ * https://betterdiscord.net
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * Material Design Icons
+ * Copyright (c) 2014 Google
+ * Apache 2.0 LICENSE
+ * https://www.apache.org/licenses/LICENSE-2.0.txt
+*/
+
+<template>
+    <span class="bd-material-design-icon">
+        <svg :width="size || 24" :height="size || 24" viewBox="0 0 24 24">
+            <path fill-opacity="1" stroke-width="0.2" stroke-linejoin="round" d="M 11.9994,16.998C 13.1044,16.998 13.9994,16.1021 13.9994,14.998C 13.9994,13.894 13.1044,12.998 11.9994,12.998C 10.8954,12.998 9.9994,13.894 9.9994,14.998C 9.9994,16.1021 10.8954,16.998 11.9994,16.998 Z M 17.9994,7.99813C 19.1034,7.99813 19.9994,8.89413 19.9994,9.99813L 19.9994,19.9981C 19.9994,21.1021 19.1034,21.9981 17.9994,21.9981L 5.99938,21.9981C 4.89539,21.9981 3.99938,21.1021 3.99938,19.9981L 3.99938,9.99813C 3.99938,8.89413 4.89539,7.99813 5.99938,7.99813L 6.99938,7.99813L 6.99938,5.99813C 6.99938,3.23714 9.23838,0.998133 11.9994,0.998133C 14.7604,0.998133 16.9994,3.23714 16.9994,5.99813L 16.9994,7.99813L 17.9994,7.99813 Z M 12,3C 10.3431,3 9,4.34315 9,6L 9,8L 15,8L 15,6C 15,4.34315 13.6569,3 12,3 Z " />
+        </svg>
+    </span>
+</template>
+<script>
+    export default {
+        props: ['size']
+    }
+</script>