diff --git a/app/src/components/Common.js b/app/src/components/Common.js
index 8417a730..58e1a20a 100644
--- a/app/src/components/Common.js
+++ b/app/src/components/Common.js
@@ -1010,7 +1010,7 @@ export function DarkModeToggle() {
     return <Icon
         name={iconName}
         onClick={cycleSavedTheme}
-        style={{cursor: 'pointer'}}
+        style={{cursor: 'pointer', marginRight: '0.8em'}}
     />
 }
 
diff --git a/app/src/components/Nav.js b/app/src/components/Nav.js
index 0ff43783..f83009a8 100644
--- a/app/src/components/Nav.js
+++ b/app/src/components/Nav.js
@@ -2,18 +2,13 @@ import React from "react";
 import {Link, NavLink} from "react-router-dom";
 import {Dropdown, Icon as SIcon, Menu} from "semantic-ui-react";
 import {Media, SettingsContext, StatusContext, ThemeContext} from "../contexts/contexts";
-import {
-    CPUTemperatureIcon,
-    DarkModeToggle,
-    HotspotStatusIcon,
-    SystemLoadIcon,
-    useLocalStorage
-} from "./Common";
+import {CPUTemperatureIcon, DarkModeToggle, HotspotStatusIcon, SystemLoadIcon, useLocalStorage} from "./Common";
 import {ShareButton} from "./Share";
 import {useWROLMode} from "../hooks/customHooks";
 import {SearchIconButton} from "./Search";
 import {Icon} from "./Theme";
 import {HELP_VIEWER_URI, NAME} from "./Vars";
+import _ from "lodash";
 
 const links = [
     {text: 'Videos', to: '/videos', key: 'videos'},
@@ -65,7 +60,14 @@ function MenuLink({link}) {
 }
 
 function NavIconWrapper(props) {
-    return <div style={{margin: '0.8em'}}>{props.children}</div>
+    if (_.isEmpty(props.children)) {
+        return <></>
+    } else {
+        if (props.name === 'warning') {
+            // console.log(props.name, props.children);
+        }
+        return <div style={{marginTop: '0.8em', marginLeft: '1.5em'}}>{props.children}</div>
+    }
 }
 
 function useNavColorSetting() {
@@ -98,17 +100,26 @@ export function NavBar() {
     // Display the temperature icon first because it can cause the system to throttle.
     const warningIcon = <CPUTemperatureIcon fallback={<SystemLoadIcon/>}/>;
 
-    const refreshingIcon = status.flags && status.flags.refreshing ?
-        <Link to='/files'><Icon loading name='circle notch' size='large'/></Link>
-        : null;
+    let processingLink;
+    if (status && status.flags) {
+        if (status.flags.refreshing) {
+            processingLink = '/files';
+        } else if (status.flags.map_importing) {
+            processingLink = '/map/manage';
+        }
+    }
+
+    const processingIcon = processingLink &&
+        <Link to={processingLink}>
+            <Icon loading name='circle notch' size='large'/>
+        </Link>;
 
     const icons = <React.Fragment>
-        <NavIconWrapper>{refreshingIcon}</NavIconWrapper>
-        <NavIconWrapper>{warningIcon}</NavIconWrapper>
-        <NavIconWrapper><ShareButton/></NavIconWrapper>
-        <NavIconWrapper><HotspotStatusIcon/></NavIconWrapper>
-        <NavIconWrapper><DarkModeToggle/></NavIconWrapper>
-        <span style={{marginTop: '0.5em'}}><SearchIconButton/></span>
+        <NavIconWrapper name='processing'>{processingIcon}</NavIconWrapper>
+        <NavIconWrapper name='warning'>{warningIcon}</NavIconWrapper>
+        <NavIconWrapper name='share'><ShareButton/></NavIconWrapper>
+        <NavIconWrapper name='hotspot'><HotspotStatusIcon/></NavIconWrapper>
+        <NavIconWrapper name='dark mode'><DarkModeToggle/></NavIconWrapper>
     </React.Fragment>;
 
     return <>
@@ -117,6 +128,7 @@ export function NavBar() {
                 {homeLink}
                 <Menu.Menu position='right'>
                     {icons}
+                    <SearchIconButton/>
                     <Dropdown item icon="bars">
                         <Dropdown.Menu>
                             {collapsedLinks.map(i => <MenuLink link={i} key={i.key}/>)}
@@ -132,6 +144,7 @@ export function NavBar() {
 
                 <Menu.Menu position='right'>
                     {icons}
+                    <SearchIconButton/>
                     {rightLinks.map(i => <MenuLink link={i} key={i.key}/>)}
                 </Menu.Menu>
             </Menu>
diff --git a/app/src/components/Search.js b/app/src/components/Search.js
index 31f1db26..0502ee68 100644
--- a/app/src/components/Search.js
+++ b/app/src/components/Search.js
@@ -7,16 +7,7 @@ import {searchEstimateFiles, searchEstimateOthers, searchEstimateZims, searchSug
 import {filterToMimetypes, fuzzyMatch, normalizeEstimate, SearchResultsInput, TabLinks} from "./Common";
 import _ from "lodash";
 import {TagsContext} from "../Tags";
-import {
-    AccordionContent,
-    AccordionTitle,
-    Button as SButton,
-    Grid,
-    GridColumn,
-    GridRow,
-    Header as SHeader,
-    Label
-} from "semantic-ui-react";
+import {AccordionContent, AccordionTitle, Grid, GridColumn, GridRow, Header as SHeader, Label} from "semantic-ui-react";
 import {Accordion, Header, Icon, Loader, Modal, ModalContent, Segment} from "./Theme";
 import {QueryContext, ThemeContext} from "../contexts/contexts";
 
@@ -409,8 +400,11 @@ export function SearchIconButton() {
         prevOpen.current = open;
     }, [open]);
 
-    return <React.Fragment>
-        <SButton icon='search' onClick={() => setOpen(!open)} color='blue' style={{marginTop: '-0.2em'}}/>
+    const toggleOpen = () => setOpen(!open);
+
+    // Return an "item" class because this can be highlighted when hovered over on the nav bar.
+    return <a className='item' style={{paddingRight: '0.8em'}} onClick={toggleOpen}>
+        <Icon name='search' onClick={toggleOpen}/>
         <Modal open={open} onClose={() => setOpen(false)} centered={false}>
             <ModalContent>
                 <SearchResultsInput clearable
@@ -426,7 +420,7 @@ export function SearchIconButton() {
                 />
             </ModalContent>
         </Modal>
-    </React.Fragment>
+    </a>
 }
 
 function SearchChannelPreview({channel}) {