2 files changed, 18 insertions, 16 deletions

diff --git a/web/react/components/file_upload_overlay.jsx b/web/react/components/file_upload_overlay.jsx
index d991dd625..dbba00022 100644
--- a/web/react/components/file_upload_overlay.jsx
+++ b/web/react/components/file_upload_overlay.jsx
@@ -12,19 +12,21 @@ export default class FileUploadOverlay extends React.Component {
 
         return (
             <div className={overlayClass}>
-                <div className='overlay__circle'>
-                    <img
-                        className='overlay__files'
-                        src='/static/images/filesOverlay.png'
-                        alt='Files'
-                    />
-                    <span><i className='fa fa-upload'></i>{'Drop a file to upload it.'}</span>
-                    <img
-                        className='overlay__logo'
-                        src='/static/images/logoWhite.png'
-                        width='100'
-                        alt='Logo'
-                    />
+                <div className='overlay__indent'>
+                    <div className='overlay__circle'>
+                        <img
+                            className='overlay__files'
+                            src='/static/images/filesOverlay.png'
+                            alt='Files'
+                        />
+                        <span><i className='fa fa-upload'></i>{'Drop a file to upload it.'}</span>
+                        <img
+                            className='overlay__logo'
+                            src='/static/images/logoWhite.png'
+                            width='100'
+                            alt='Logo'
+                        />
+                    </div>
                 </div>
             </div>
         );
diff --git a/web/react/components/search_bar.jsx b/web/react/components/search_bar.jsx
index bf12ca160..7540b41a4 100644
--- a/web/react/components/search_bar.jsx
+++ b/web/react/components/search_bar.jsx
@@ -8,7 +8,7 @@ var AppDispatcher = require('../dispatcher/app_dispatcher.jsx');
 var utils = require('../utils/utils.jsx');
 var Constants = require('../utils/constants.jsx');
 var ActionTypes = Constants.ActionTypes;
-var Tooltip = ReactBootstrap.Tooltip;
+var Popover = ReactBootstrap.Popover;
 
 export default class SearchBar extends React.Component {
     constructor() {
@@ -163,7 +163,7 @@ export default class SearchBar extends React.Component {
                         onMouseUp={this.handleMouseInput}
                     />
                     {isSearching}
-                    <Tooltip
+                    <Popover
                         placement='bottom'
                         className={helpClass}
                     >
@@ -176,7 +176,7 @@ export default class SearchBar extends React.Component {
                                 <span>{'Use '}</span><b>{'from:'}</b><span>{' to find posts from specific users and '}</span><b>{'in:'}</b><span>{' to find posts in specific channels'}</span>
                             </li>
                         </ul>
-                    </Tooltip>
+                    </Popover>
                 </form>
             </div>
         );