diff --git a/client/homebrew/navbar/navbar.jsx b/client/homebrew/navbar/navbar.jsx
index 8d21d987b..4e5ec4070 100644
--- a/client/homebrew/navbar/navbar.jsx
+++ b/client/homebrew/navbar/navbar.jsx
@@ -52,7 +52,7 @@ const Navbar = ({ children, brew, pageName, editor, title, currentPage, props })
 					<Nav.item icon='fas fa-download' href={`/download/${shareLink}`} disabled={!brew?.shareId}>
 						Download raw text
 					</Nav.item>
-					<PrintNavItem disabled={pageName !== 'newPage' && pageName !== 'editPage' && pageName !== 'editPage'} />
+					<PrintNavItem disabled={pageName !== 'newPage' && pageName !== 'homePage' && pageName !== 'editPage'} />
 				</div>
 				{navSlots.file}
 			</Dropdown>
@@ -92,7 +92,7 @@ const Navbar = ({ children, brew, pageName, editor, title, currentPage, props })
 						Patreon
 					</Nav.item>
 				</div>
-				<ShareNavItem brew={brew} disabled={!brew?.shareId} currentPage={currentPage} />
+				<ShareNavItem brew={brew} disabled={!brew?.shareId} currentPage={currentPage} pageName={pageName} />
 				{navSlots.go}
 			</Dropdown>
 		);
diff --git a/client/homebrew/navbar/navbar.less b/client/homebrew/navbar/navbar.less
index b9a590ad8..21ed1d0e1 100644
--- a/client/homebrew/navbar/navbar.less
+++ b/client/homebrew/navbar/navbar.less
@@ -153,9 +153,16 @@
 			}
 		}
 		&.save {
-			width: 100px;
+			width: 130px;
+			padding-left:30px;
 			display:grid;
 			place-items: stretch;
+			align-items: stretch;
+
+			i {
+				place-self:center;
+				left:10px;
+			}
 			
 			&.neverSaved {
 				background-color: @orange;
@@ -176,6 +183,7 @@
 	.navItem,
 	.menu-wrapper {
 		--activeTriggerColor: #666;
+		text-transform: capitalize;
 
 		&:has(ul):not(:has(ul :is(button, a):not(:disabled))) {
 			color: grey; //faux disabled if all buttons are disabled
@@ -192,6 +200,11 @@
 			justify-content: space-between;
 		}
 
+		&:has( >i ){
+			padding-left: 25px;
+			position:relative;
+		}
+
 		i {
 			position:absolute;
 			left:5px;
diff --git a/client/homebrew/navbar/recent.navitem.jsx b/client/homebrew/navbar/recent.navitem.jsx
index 121c6a335..54ee68df6 100644
--- a/client/homebrew/navbar/recent.navitem.jsx
+++ b/client/homebrew/navbar/recent.navitem.jsx
@@ -141,7 +141,6 @@ const RecentItems = createReactClass({
 
 	renderDropdown : function(){
 		const makeItems = (brews)=>{
-			console.log(brews);
 			if(brews.length === 0) return <Nav.item>No recent brews</Nav.item>
 			return <div className='nav-section'>
 				{_.map(brews, (brew, i)=>{
diff --git a/client/homebrew/navbar/share.navitem.jsx b/client/homebrew/navbar/share.navitem.jsx
index ad825d63e..85bb6555c 100644
--- a/client/homebrew/navbar/share.navitem.jsx
+++ b/client/homebrew/navbar/share.navitem.jsx
@@ -22,13 +22,13 @@ const getRedditLink = (brew)=>{
 	return `https://www.reddit.com/r/UnearthedArcana/submit?title=${encodeURIComponent(brew.title.toWellFormed())}&text=${encodeURIComponent(text)}`;
 };
 
-export default ({ brew, disabled, currentPage })=>{
+export default ({ brew, disabled, currentPage, pageName })=>{
 	return (
 		<div className='nav-section'>
-			<Nav.item icon='fas fa-code' href={`/source/${getShareId(brew)}`}>
+			<Nav.item icon='fas fa-code' href={`/source/${getShareId(brew)}`} disabled={disabled}>
 				View Raw Text
 			</Nav.item>
-			<Nav.item icon={'fas fa-pencil'} href={`/edit/${getEditId(brew)}`} disabled={disabled || !brew?.editId}>
+			<Nav.item icon={'fas fa-pencil'} href={`/edit/${getEditId(brew)}`} disabled={disabled || !brew?.editId || pageName === 'editPage'}>
 				edit this brew
 			</Nav.item>
 			<Nav.item icon={'fas fa-share-alt'} href={`/share/${getShareId(brew)}`} disabled={disabled}>
diff --git a/client/homebrew/pages/basePages/editorPage/editorPage.jsx b/client/homebrew/pages/basePages/editorPage/editorPage.jsx
index 34c202bc8..cb9ae19c6 100644
--- a/client/homebrew/pages/basePages/editorPage/editorPage.jsx
+++ b/client/homebrew/pages/basePages/editorPage/editorPage.jsx
@@ -259,12 +259,12 @@ const EditorPage = (props)=>{
 			return <Nav.item className='save neverSaved' onClick={()=>trySave(true, true, saveGoogle)} color='blue' icon='fas fa-save'>save now</Nav.item>;
 
 		if(autoSaveEnabled)
-			return <Nav.item className='save saved'>auto-saved</Nav.item>;
+			return <Nav.item className='save saved' icon='fas fa-save'>auto-saved</Nav.item>;
 
 		if(sandbox)
-			return <Nav.item className='save' disabled={true}>no changes</Nav.item>;
+			return <Nav.item className='save' icon='fas fa-save' disabled={true}>no changes</Nav.item>;
 
-		return <Nav.item className='save saved'>saved</Nav.item>;
+		return <Nav.item className='save saved' icon='fas fa-save'>saved</Nav.item>;
 	};
 
 	//TODO: Candidate for refactor/rename; used with history tool to load previous verion; may overlap with snippet injection or handleBrewChange
@@ -309,9 +309,8 @@ const EditorPage = (props)=>{
 		const errorExists = alertNoGoogleToTransfer || alertOwnershipToTransfer || alertTrashedGoogleBrew || confirmGoogleTransfer;
 		return (<>
 			<Nav.header>This brew is in {saveGoogle ? 'Google Drive' : 'The Homebrewery'}</Nav.header>
-			<Nav.item icon={'fas fa-hard-drive'} className='googleDriveStorage' noDismiss='true' onClick={handleGoogleClick}>
+			<Nav.item icon={saveGoogle ? 'fac homebrewery' : 'fab fa-google-drive'} className='googleDriveStorage' noDismiss='true' onClick={handleGoogleClick}>
 				{saveGoogle ? 'Transfer to Homebrewery' : 'Transfer to Drive'}
-				{saveGoogle? '' : <img src={googleDriveIcon} alt='Google Drive icon' /> }
 			</Nav.item>
 			{errorExists && <Nav.item className='errorContainer' >
 				{alertOwnershipToTransfer && (
diff --git a/client/icons/customIcons.less b/client/icons/customIcons.less
index a0678555d..c642752e2 100644
--- a/client/icons/customIcons.less
+++ b/client/icons/customIcons.less
@@ -34,3 +34,4 @@
 .flow-spread { mask-image : url('../icons/flow-spread.svg'); }
 .format-card { mask-image: url('../icons/format-card.svg'); }
 .compressed-grid { mask-image: url('../icons//compressed-grid.svg'); }
+.homebrewery { mask-image: url('../homebrew/thumbnail.svg'); }
\ No newline at end of file