diff --git a/src/js/views/chat/ChatList.tsx b/src/js/views/chat/ChatList.tsx
index db0114e4..3e17925f 100644
--- a/src/js/views/chat/ChatList.tsx
+++ b/src/js/views/chat/ChatList.tsx
@@ -73,7 +73,7 @@ class ChatList extends BaseComponent<ChatListProps, ChatListState> {
 
     return (
       <section
-        className={`h-screen overflow-x-hidden overflow-y-scroll w-64 ${
+        className={`h-screen overflow-x-hidden overflow-y-scroll px-2 md:px-0 w-full md:w-64 ${
           this.props.className || ''
         }`}
       >
diff --git a/src/js/views/settings/Settings.tsx b/src/js/views/settings/Settings.tsx
index 7c9288d4..c9c7c49c 100644
--- a/src/js/views/settings/Settings.tsx
+++ b/src/js/views/settings/Settings.tsx
@@ -1,5 +1,4 @@
 import Header from '../../components/Header';
-import Icons from '../../Icons';
 
 import SettingsContent from './SettingsContent';
 import SettingsMenu from './SettingsMenu';
@@ -10,17 +9,9 @@ const Settings = (props: Props) => {
   return (
     <>
       <Header />
-      <div className="flex flex-row">
-        <div className={props.page ? 'flex md:hidden' : 'hidden'}>
-          <a href="/settings">
-            <span>{Icons.backArrow}</span>
-          </a>
-        </div>
+      <div className="flex flex-row px-2 md:px-0">
         <SettingsMenu activePage={props.page} />
-        <div
-          className={props.page ? '' : 'hidden-xs'}
-          style="padding: 0px 15px; overflow: auto; width: 100%;"
-        >
+        <div className={props.page ? '' : 'hidden md:flex'}>
           <SettingsContent id={props.page} />
         </div>
       </div>
diff --git a/src/js/views/settings/SettingsMenu.tsx b/src/js/views/settings/SettingsMenu.tsx
index 9a5f4c7c..4780885a 100644
--- a/src/js/views/settings/SettingsMenu.tsx
+++ b/src/js/views/settings/SettingsMenu.tsx
@@ -33,7 +33,7 @@ export default class SettingsMenu extends Component {
     const activePage = this.props.activePage || 'account';
     return (
       <div
-        className={`flex-col w-48 flex-shrink-0 ${
+        className={`flex-col w-full md:w-48 flex-shrink-0 ${
           !this.props.activePage ? 'flex' : 'hidden md:flex'
         }`}
       >