diff --git a/web/react/components/user_settings/user_settings_display.jsx b/web/react/components/user_settings/user_settings_display.jsx
index fd1e280333..c464258de3 100644
--- a/web/react/components/user_settings/user_settings_display.jsx
+++ b/web/react/components/user_settings/user_settings_display.jsx
@@ -240,14 +240,18 @@ export default class UserSettingsDisplay extends React.Component {
 
             const inputs = [
                 <div key='userDisplayNameOptions'>
-                    <select
-                        className='form-control'
-                        type='text'
-                        value={this.state.selectedFont}
-                        onChange={(e) => this.handleFont(e.target.value)}
+                    <div
+                        className='dropdown'
                     >
-                        {options}
-                    </select>
+                        <select
+                            className='form-control'
+                            type='text'
+                            value={this.state.selectedFont}
+                            onChange={(e) => this.handleFont(e.target.value)}
+                        >
+                            {options}
+                        </select>
+                    </div>
                     <div><br/>{'Select the font displayed in the Mattermost user interface.'}</div>
                 </div>
             ];
@@ -305,12 +309,12 @@ export default class UserSettingsDisplay extends React.Component {
                 <div className='user-settings'>
                     <h3 className='tab-header'>{'Display Settings'}</h3>
                     <div className='divider-dark first'/>
+                    {fontSection}
+                    <div className='divider-dark'/>
                     {clockSection}
                     <div className='divider-dark'/>
                     {nameFormatSection}
                     <div className='divider-dark'/>
-                    {fontSection}
-                    <div className='divider-dark'/>
                 </div>
             </div>
         );
diff --git a/web/sass-files/sass/partials/_suggestion_list.scss b/web/sass-files/sass/partials/_suggestion_list.scss
index 0cf3fff5f0..5e91a126d2 100644
--- a/web/sass-files/sass/partials/_suggestion_list.scss
+++ b/web/sass-files/sass/partials/_suggestion_list.scss
@@ -47,17 +47,19 @@
 }
 
 .emoticon-suggestion {
+    @include clearfix;
     width: 100%;
-    height: 36px;
+    height: 30px;
     cursor: pointer;
     font-size: 13px;
-    line-height: 36px;
+    line-height: 30px;
 }
 
 .emoticon-suggestion__image {
-    width: 32px;
-    height: 32px;
-    margin-right: 6px;
-    padding: 2px;
+    width: 20px;
+    height: 20px;
+    margin: 6px 6px 0 5px;
+    padding: 0;
     text-align: center;
+    vertical-align: top;
 }