diff --git a/app/features/conference/components/Conference.js b/app/features/conference/components/Conference.js
index 2639e11..7b9e4c9 100644
--- a/app/features/conference/components/Conference.js
+++ b/app/features/conference/components/Conference.js
@@ -31,11 +31,6 @@ type Props = {
      */
     _alwaysOnTopWindowEnabled: boolean;
 
-    /**
-     * Avatar URL.
-     */
-    _avatarURL: string;
-
     /**
      * Email of user.
      */
@@ -169,9 +164,6 @@ class Conference extends Component<Props, State> {
     componentDidUpdate(prevProps) {
         const { props } = this;
 
-        if (props._avatarURL !== prevProps._avatarURL) {
-            this._setAvatarURL(props._avatarURL);
-        }
         if (props._email !== prevProps._email) {
             this._setEmail(props._email);
         }
@@ -370,7 +362,6 @@ class Conference extends Component<Props, State> {
      * @returns {void}
      */
     _onVideoConferenceJoined(conferenceInfo: Object) {
-        this._setAvatarURL(this.props._avatarURL);
         this._setEmail(this.props._email);
         this._setName(this.props._name);
 
@@ -382,16 +373,6 @@ class Conference extends Component<Props, State> {
             (params: Object) => this._onEmailChange(params, id));
     }
 
-    /**
-     * Set Avatar URL from settings to conference.
-     *
-     * @param {string} avatarURL - Avatar URL.
-     * @returns {void}
-     */
-    _setAvatarURL(avatarURL: string) {
-        this._api.executeCommand('avatarUrl', avatarURL);
-    }
-
     /**
      * Set email from settings to conference.
      *
@@ -422,9 +403,7 @@ class Conference extends Component<Props, State> {
  */
 function _mapStateToProps(state: Object) {
     return {
-        _alwaysOnTopWindowEnabled:
-            getSetting(state, 'alwaysOnTopWindowEnabled', true),
-        _avatarURL: state.settings.avatarURL,
+        _alwaysOnTopWindowEnabled: getSetting(state, 'alwaysOnTopWindowEnabled', true),
         _email: state.settings.email,
         _name: state.settings.name,
         _serverURL: state.settings.serverURL,
diff --git a/app/features/onboarding/components/EmailSettingSpotlight.js b/app/features/onboarding/components/EmailSettingSpotlight.js
index ad1237e..e4c3396 100644
--- a/app/features/onboarding/components/EmailSettingSpotlight.js
+++ b/app/features/onboarding/components/EmailSettingSpotlight.js
@@ -47,8 +47,7 @@ class EmailSettingSpotlight extends Component<Props, *> {
                 ] }
                 dialogPlacement = 'left top'
                 target = { 'email-setting' } >
-                The email you enter here will be part of your user profile and
-                it will be used to display your stored avatar in gravatar.com .
+                The email you enter here will be part of your user profile.
             </Spotlight>
         );
     }
diff --git a/app/features/redux/middleware.js b/app/features/redux/middleware.js
index 86d7acc..3774a64 100644
--- a/app/features/redux/middleware.js
+++ b/app/features/redux/middleware.js
@@ -5,11 +5,9 @@ import { createLogger } from 'redux-logger';
 
 import { middleware as onboardingMiddleware } from '../onboarding';
 import { middleware as routerMiddleware } from '../router';
-import { middleware as settingsMiddleware } from '../settings';
 
 export default applyMiddleware(
     onboardingMiddleware,
     routerMiddleware,
-    settingsMiddleware,
     createLogger()
 );
diff --git a/app/features/settings/actionTypes.js b/app/features/settings/actionTypes.js
index 0c8075f..fd73c63 100644
--- a/app/features/settings/actionTypes.js
+++ b/app/features/settings/actionTypes.js
@@ -19,16 +19,6 @@ export const SET_ALWAYS_ON_TOP_WINDOW_ENABLED
  */
 export const SET_AUDIO_MUTED = Symbol('SET_AUDIO_MUTED');
 
-/**
- * The type of (redux) action that sets the Avatar URL.
- *
- * @type {
- *     type: SET_AVATAR_URL,
- *     avatarURL: string
- * }
- */
-export const SET_AVATAR_URL = Symbol('SET_AVATAR_URL');
-
 /**
  * The type of (redux) action that sets the email of the user.
  *
diff --git a/app/features/settings/actions.js b/app/features/settings/actions.js
index 7e3c054..054c890 100644
--- a/app/features/settings/actions.js
+++ b/app/features/settings/actions.js
@@ -3,7 +3,6 @@
 import {
     SET_ALWAYS_ON_TOP_WINDOW_ENABLED,
     SET_AUDIO_MUTED,
-    SET_AVATAR_URL,
     SET_EMAIL,
     SET_NAME,
     SET_SERVER_URL,
@@ -13,22 +12,6 @@ import {
 
 import { normalizeServerURL } from '../utils';
 
-/**
- * Set Avatar URL.
- *
- * @param {string} avatarURL - Avatar URL.
- * @returns {{
- *     type: SET_AVATAR_URL,
- *     avatarURL: string
- * }}
- */
-export function setAvatarURL(avatarURL: string) {
-    return {
-        type: SET_AVATAR_URL,
-        avatarURL
-    };
-}
-
 /**
  * Set the email of the user.
  *
diff --git a/app/features/settings/components/ServerTimeoutField.js b/app/features/settings/components/ServerTimeoutField.js
index 41c2434..742f49f 100644
--- a/app/features/settings/components/ServerTimeoutField.js
+++ b/app/features/settings/components/ServerTimeoutField.js
@@ -9,6 +9,7 @@ import type { Dispatch } from 'redux';
 import config from '../../config';
 
 import { setServerTimeout } from '../actions';
+import { Form } from '../styled';
 
 type Props = {
 
@@ -64,7 +65,7 @@ class ServerTimeoutField extends Component<Props, State> {
      */
     render() {
         return (
-            <form onSubmit = { this._onServerTimeoutSubmit }>
+            <Form onSubmit = { this._onServerTimeoutSubmit }>
                 <FieldTextStateless
                     invalidMessage
                         = { 'Invalid Timeout' }
@@ -77,7 +78,7 @@ class ServerTimeoutField extends Component<Props, State> {
                     shouldFitContainer = { true }
                     type = 'number'
                     value = { this.state.serverTimeout } />
-            </form>
+            </Form>
         );
     }
 
diff --git a/app/features/settings/components/ServerURLField.js b/app/features/settings/components/ServerURLField.js
index f7a01b7..b85ba4a 100644
--- a/app/features/settings/components/ServerURLField.js
+++ b/app/features/settings/components/ServerURLField.js
@@ -10,6 +10,7 @@ import config from '../../config';
 import { getExternalApiURL } from '../../utils';
 
 import { setServerURL } from '../actions';
+import { Form } from '../styled';
 
 type Props = {
 
@@ -65,7 +66,7 @@ class ServerURLField extends Component<Props, State> {
      */
     render() {
         return (
-            <form onSubmit = { this._onServerURLSubmit }>
+            <Form onSubmit = { this._onServerURLSubmit }>
                 <FieldTextStateless
                     invalidMessage
                         = { 'Invalid Server URL or external API not enabled' }
@@ -78,7 +79,7 @@ class ServerURLField extends Component<Props, State> {
                     shouldFitContainer = { true }
                     type = 'text'
                     value = { this.state.serverURL } />
-            </form>
+            </Form>
         );
     }
 
diff --git a/app/features/settings/components/SettingsDrawer.js b/app/features/settings/components/SettingsDrawer.js
index bba6cb8..62f2a05 100644
--- a/app/features/settings/components/SettingsDrawer.js
+++ b/app/features/settings/components/SettingsDrawer.js
@@ -1,6 +1,5 @@
 // @flow
 
-import Avatar from '@atlaskit/avatar';
 import FieldText from '@atlaskit/field-text';
 import ArrowLeft from '@atlaskit/icon/glyph/arrow-left';
 import { AkCustomDrawer } from '@atlaskit/navigation';
@@ -13,7 +12,7 @@ import type { Dispatch } from 'redux';
 
 import { closeDrawer, DrawerContainer, Logo } from '../../navbar';
 import { Onboarding, startOnboarding } from '../../onboarding';
-import { AvatarContainer, SettingsContainer, TogglesContainer } from '../styled';
+import { Form, SettingsContainer, TogglesContainer } from '../styled';
 import { setEmail, setName } from '../actions';
 
 import AlwaysOnTopWindowToggle from './AlwaysOnTopWindowToggle';
@@ -33,11 +32,6 @@ type Props = {
      */
     isOpen: boolean;
 
-    /**
-     * Avatar URL.
-     */
-    _avatarURL: string;
-
     /**
      * Email of the user.
      */
@@ -101,32 +95,27 @@ class SettingsDrawer extends Component<Props, *> {
                 primaryIcon = { <Logo /> } >
                 <DrawerContainer>
                     <SettingsContainer>
-                        <AvatarContainer>
-                            <Avatar
-                                size = 'xlarge'
-                                src = { this.props._avatarURL } />
-                        </AvatarContainer>
                         <SpotlightTarget
                             name = 'name-setting'>
-                            <form onSubmit = { this._onNameFormSubmit }>
+                            <Form onSubmit = { this._onNameFormSubmit }>
                                 <FieldText
                                     label = 'Name'
                                     onBlur = { this._onNameBlur }
                                     shouldFitContainer = { true }
                                     type = 'text'
                                     value = { this.props._name } />
-                            </form>
+                            </Form>
                         </SpotlightTarget>
                         <SpotlightTarget
                             name = 'email-setting'>
-                            <form onSubmit = { this._onEmailFormSubmit }>
+                            <Form onSubmit = { this._onEmailFormSubmit }>
                                 <FieldText
                                     label = 'Email'
                                     onBlur = { this._onEmailBlur }
                                     shouldFitContainer = { true }
                                     type = 'text'
                                     value = { this.props._email } />
-                            </form>
+                            </Form>
                         </SpotlightTarget>
                         <SpotlightTarget
                             name = 'server-setting'>
@@ -167,7 +156,7 @@ class SettingsDrawer extends Component<Props, *> {
     _onEmailBlur: (*) => void;
 
     /**
-     * Updates Avatar URL in (redux) state when email is updated.
+     * Updates email in (redux) state when email is updated.
      *
      * @param {SyntheticInputEvent<HTMLInputElement>} event - Event by which
      * this function is called.
@@ -196,7 +185,7 @@ class SettingsDrawer extends Component<Props, *> {
     _onNameBlur: (*) => void;
 
     /**
-     * Updates Avatar URL in (redux) state when name is updated.
+     * Updates name in (redux) state when name is updated.
      *
      * @param {SyntheticInputEvent<HTMLInputElement>} event - Event by which
      * this function is called.
@@ -227,15 +216,10 @@ class SettingsDrawer extends Component<Props, *> {
  * Maps (parts of) the redux state to the React props.
  *
  * @param {Object} state - The redux state.
- * @returns {{
- *     _avatarURL: string,
- *     _email: string,
- *     _name: string
- * }}
+ * @returns {Props}
  */
 function _mapStateToProps(state: Object) {
     return {
-        _avatarURL: state.settings.avatarURL,
         _email: state.settings.email,
         _name: state.settings.name
     };
diff --git a/app/features/settings/functions.js b/app/features/settings/functions.js
index 60be339..b3a7392 100644
--- a/app/features/settings/functions.js
+++ b/app/features/settings/functions.js
@@ -1,26 +1,5 @@
 // @flow
 
-import md5 from 'js-md5';
-
-/**
- * Generates an avatar URL for a user, given the name and email settings.
- *
- * @param {Object} state - The redux state.
- * @returns {string} - The generated avatar URL.
- */
-export function getAvatarURL(state: Object) {
-    const { email, name } = state.settings;
-    const encodedName = encodeURIComponent(name || '');
-
-    if (email) {
-        const md5email = md5.hex(email.trim().toLowerCase());
-
-        return `https://www.gravatar.com/avatar/${md5email}?d=https%3A%2F%2Fui-avatars.com%2Fapi%2F/${encodedName}/128`;
-    }
-
-    return `https://ui-avatars.com/api/?name=${encodedName}&size=128`;
-}
-
 /**
  * Get's the value for the given setting, providing a default value.
  *
diff --git a/app/features/settings/index.js b/app/features/settings/index.js
index 40f520e..bbedb45 100644
--- a/app/features/settings/index.js
+++ b/app/features/settings/index.js
@@ -4,5 +4,4 @@ export * from './components';
 export * from './functions';
 export * from './styled';
 
-export { default as middleware } from './middleware';
 export { default as reducer } from './reducer';
diff --git a/app/features/settings/middleware.js b/app/features/settings/middleware.js
deleted file mode 100644
index 49f3bc8..0000000
--- a/app/features/settings/middleware.js
+++ /dev/null
@@ -1,19 +0,0 @@
-// @flow
-
-import { SET_EMAIL, SET_NAME } from './actionTypes';
-import { setAvatarURL } from './actions';
-import { getAvatarURL } from './functions';
-
-export default (store: Object) => (next: Function) => (action: Object) => {
-    const result = next(action);
-    const state = store.getState();
-
-    switch (action.type) {
-    case SET_EMAIL:
-    case SET_NAME:
-        store.dispatch(setAvatarURL(getAvatarURL(state)));
-
-    }
-
-    return result;
-};
diff --git a/app/features/settings/reducer.js b/app/features/settings/reducer.js
index ff6df6e..5f09b7c 100644
--- a/app/features/settings/reducer.js
+++ b/app/features/settings/reducer.js
@@ -3,31 +3,27 @@
 import {
     SET_ALWAYS_ON_TOP_WINDOW_ENABLED,
     SET_AUDIO_MUTED,
-    SET_AVATAR_URL,
     SET_EMAIL,
     SET_NAME,
     SET_SERVER_URL,
     SET_SERVER_TIMEOUT,
     SET_VIDEO_MUTED
 } from './actionTypes';
-import { getAvatarURL } from './functions';
 
 type State = {
-    avatarURL: string,
+    alwaysOnTopWindowEnabled: boolean,
     email: string,
     name: string,
     serverURL: ?string,
     serverTimeout: ?number,
     startWithAudioMuted: boolean,
-    startWithVideoMuted: boolean,
-    alwaysOnTopWindowEnabled: boolean,
+    startWithVideoMuted: boolean
 };
 
 const username = window.jitsiNodeAPI.osUserInfo().username;
 
 const DEFAULT_STATE = {
     alwaysOnTopWindowEnabled: true,
-    avatarURL: getAvatarURL({ settings: { name: username } }),
     email: '',
     name: username,
     serverURL: undefined,
@@ -57,12 +53,6 @@ export default (state: State = DEFAULT_STATE, action: Object) => {
             startWithAudioMuted: action.startWithAudioMuted
         };
 
-    case SET_AVATAR_URL:
-        return {
-            ...state,
-            avatarURL: action.avatarURL
-        };
-
     case SET_EMAIL:
         return {
             ...state,
diff --git a/app/features/settings/styled/AvatarContainer.js b/app/features/settings/styled/AvatarContainer.js
deleted file mode 100644
index 65e617e..0000000
--- a/app/features/settings/styled/AvatarContainer.js
+++ /dev/null
@@ -1,9 +0,0 @@
-// @flow
-
-import styled from 'styled-components';
-
-export default styled.div`
-    align-items: center;
-    display: flex;
-    flex-direction: column;
-`;
diff --git a/app/features/settings/styled/Form.js b/app/features/settings/styled/Form.js
new file mode 100644
index 0000000..a27947a
--- /dev/null
+++ b/app/features/settings/styled/Form.js
@@ -0,0 +1,7 @@
+// @flow
+
+import styled from 'styled-components';
+
+export default styled.form`
+    margin: 0;
+`;
diff --git a/app/features/settings/styled/index.js b/app/features/settings/styled/index.js
index c97b9df..68e8fa5 100644
--- a/app/features/settings/styled/index.js
+++ b/app/features/settings/styled/index.js
@@ -1,4 +1,4 @@
-export { default as AvatarContainer } from './AvatarContainer';
+export { default as Form } from './Form';
 export { default as Label } from './Label';
 export { default as SettingsContainer } from './SettingsContainer';
 export { default as ToggleContainer } from './ToggleContainer';
diff --git a/package.json b/package.json
index c63571e..7f953e8 100644
--- a/package.json
+++ b/package.json
@@ -83,7 +83,6 @@
   "readmeFilename": "README.md",
   "license": "Apache-2.0",
   "dependencies": {
-    "@atlaskit/avatar": "14.1.7",
     "@atlaskit/button": "10.1.1",
     "@atlaskit/css-reset": "3.0.5",
     "@atlaskit/droplist": "7.0.17",
@@ -146,7 +145,6 @@
     "file-loader": "6.0.0",
     "flow-bin": "0.109.0",
     "html-webpack-plugin": "4.0.4",
-    "js-md5": "0.7.3",
     "patch-package": "6.2.2",
     "precommit-hook": "3.0.0",
     "style-loader": "1.1.3",