diff --git a/app/extensions/brave/locales/en-US/app.properties b/app/extensions/brave/locales/en-US/app.properties
index ea1ee92fa10..905a6555e2e 100644
--- a/app/extensions/brave/locales/en-US/app.properties
+++ b/app/extensions/brave/locales/en-US/app.properties
@@ -129,9 +129,9 @@ allowFlashPlayer=Allow {{origin}} to run Flash Player?
 ledgerBackupText=Your ledger keys are {{paymentId}} and {{passphrase}}
 error=Error
 caseSensitivity=Match case
-nameField=Title:
-locationField=Location:
-parentFolderField=Folder:
+nameField=Title
+locationField=Location
+parentFolderField=Folder
 save=Save
 rememberDecision=Remember this decision
 bookmarksToolbar=Bookmarks Toolbar
diff --git a/app/extensions/brave/locales/en-US/menu.properties b/app/extensions/brave/locales/en-US/menu.properties
index a0c2739f543..5a2f1eaa9db 100644
--- a/app/extensions/brave/locales/en-US/menu.properties
+++ b/app/extensions/brave/locales/en-US/menu.properties
@@ -3,6 +3,8 @@ closeTab=Close
 closeOtherTabs=Close other Tabs
 bookmarkPage=Bookmark Page
 bookmarkLink=Bookmark This Link
+bookmarkAdded=Bookmark Added
+bookmarkEdit=Edit Bookmark
 openFile=Open File…
 openLocation=Open Location…
 openSearch=Search for "{{selectedVariable}}"
@@ -19,7 +21,8 @@ paste=Paste
 pasteAndGo=Paste and Go
 pasteAndSearch=Paste and Search
 pasteWithoutFormatting=Paste without formatting
-delete=Delete
+done=Done
+remove=Remove
 selectAll=Select All
 findNext=Find Next
 findPrevious=Find Previous
@@ -50,6 +53,7 @@ clearSiteData=Clear All Cookies and Site Data…
 recentlyClosed=Recently Closed
 recentlyVisited=Recently Visited
 bookmarks=Bookmarks
+viewBookmarks=View all bookmarks
 addToFavoritesBar=Add to Favorites Bar
 window=Window
 minimize=Minimize
diff --git a/docs/state.md b/docs/state.md
index 3a3d6066658..c8844ee51ec 100644
--- a/docs/state.md
+++ b/docs/state.md
@@ -372,6 +372,7 @@ WindowStore
   bookmarkDetail: {
     currentDetail: Object, // Detail of the current bookmark which is in add/edit mode
     originalDetails: Object // Detail of the original bookmark to edit
+    shouldShowLocation: Boolean // Whether or not to show the URL input
   },
   braveryPanelDetail: {
     advancedControls: boolean, // If specified, indicates if advanced controls should be shown
diff --git a/docs/windowActions.md b/docs/windowActions.md
index 66b50dc58b8..bd7426feca1 100644
--- a/docs/windowActions.md
+++ b/docs/windowActions.md
@@ -467,7 +467,7 @@ Dispatches a message to set the find-in-page details.
 
 
 
-### setBookmarkDetail(currentDetail, originalDetail, destinationDetail) 
+### setBookmarkDetail(currentDetail, originalDetail, destinationDetail, shouldShowLocation) 
 
 Dispatches a message to set add/edit bookmark details
 If set, also indicates that add/edit is shown
@@ -480,6 +480,8 @@ If set, also indicates that add/edit is shown
 
 **destinationDetail**: `Object`, Will move the added bookmark to the specified position
 
+**shouldShowLocation**: `Object`, Whether or not to show the URL input
+
 
 
 ### setContextMenuDetail(detail) 
diff --git a/js/actions/windowActions.js b/js/actions/windowActions.js
index de8b657a409..38494b70104 100644
--- a/js/actions/windowActions.js
+++ b/js/actions/windowActions.js
@@ -643,13 +643,15 @@ const windowActions = {
    * @param {Object} currentDetail - Properties of the bookmark to change to
    * @param {Object} originalDetail - Properties of the bookmark to edit
    * @param {Object} destinationDetail - Will move the added bookmark to the specified position
+   * @param {Object} shouldShowLocation - Whether or not to show the URL input
    */
-  setBookmarkDetail: function (currentDetail, originalDetail, destinationDetail) {
+  setBookmarkDetail: function (currentDetail, originalDetail, destinationDetail, shouldShowLocation) {
     dispatch({
       actionType: WindowConstants.WINDOW_SET_BOOKMARK_DETAIL,
       currentDetail,
       originalDetail,
-      destinationDetail
+      destinationDetail,
+      shouldShowLocation
     })
   },
 
diff --git a/js/components/addEditBookmark.js b/js/components/addEditBookmark.js
index 24044bf8a02..fb5e47fdcaf 100644
--- a/js/components/addEditBookmark.js
+++ b/js/components/addEditBookmark.js
@@ -4,8 +4,8 @@
 
 const React = require('react')
 const ImmutableComponent = require('./immutableComponent')
-const Dialog = require('./dialog')
 const Button = require('./button')
+const cx = require('../lib/classSet')
 const windowActions = require('../actions/windowActions')
 const appActions = require('../actions/appActions')
 const KeyCodes = require('../../app/common/constants/keyCodes')
@@ -24,6 +24,7 @@ class AddEditBookmark extends ImmutableComponent {
     this.onClose = this.onClose.bind(this)
     this.onClick = this.onClick.bind(this)
     this.onSave = this.onSave.bind(this)
+    this.onViewBookmarks = this.onViewBookmarks.bind(this)
     this.onRemoveBookmark = this.onRemoveBookmark.bind(this)
   }
 
@@ -51,6 +52,10 @@ class AddEditBookmark extends ImmutableComponent {
     }
   }
   componentDidMount () {
+    // Automatically save if this is triggered by the url star
+    if (!this.props.shouldShowLocation) {
+      this.onSave(false)
+    }
     this.bookmarkName.select()
     this.bookmarkName.focus()
   }
@@ -96,7 +101,7 @@ class AddEditBookmark extends ImmutableComponent {
       appActions.changeSetting(settings.SHOW_BOOKMARKS_TOOLBAR, true)
     }
   }
-  onSave () {
+  onSave (closeDialog = true) {
     // First check if the title of the currentDetail is set
     if (!this.bookmarkNameValid) {
       return false
@@ -105,13 +110,19 @@ class AddEditBookmark extends ImmutableComponent {
     this.showToolbarOnFirstBookmark()
     const tag = this.isFolder ? siteTags.BOOKMARK_FOLDER : siteTags.BOOKMARK
     appActions.addSite(this.props.currentDetail, tag, this.props.originalDetail, this.props.destinationDetail)
-    this.onClose()
+    if (closeDialog) {
+      this.onClose()
+    }
   }
   onRemoveBookmark () {
     const tag = this.isFolder ? siteTags.BOOKMARK_FOLDER : siteTags.BOOKMARK
     appActions.removeSite(this.props.currentDetail, tag)
     this.onClose()
   }
+  onViewBookmarks () {
+    this.onClose()
+    windowActions.newFrame({location: 'about:bookmarks'}, true)
+  }
   get displayBookmarkName () {
     if (this.props.currentDetail.get('customTitle') !== undefined) {
       return this.props.currentDetail.get('customTitle')
@@ -119,42 +130,58 @@ class AddEditBookmark extends ImmutableComponent {
     return this.props.currentDetail.get('title') || ''
   }
   render () {
-    return <Dialog onHide={this.onClose} isClickDismiss>
-      <div className='genericForm' onClick={this.onClick}>
-        <div className='genericFormTable'>
-          <div id='bookmarkName' className='formRow'>
-            <label data-l10n-id='nameField' htmlFor='bookmarkName' />
-            <input spellCheck='false' onKeyDown={this.onKeyDown} onChange={this.onNameChange} value={this.displayBookmarkName} ref={(bookmarkName) => { this.bookmarkName = bookmarkName }} />
-          </div>
+    return <div className='bookmarkDialog'>
+      <div className='bookmarkForm' onClick={this.onClick}>
+        <div className={cx({
+          arrowUp: true,
+          withStopButton: this.props.withStopButton,
+          withHomeButton: this.props.withHomeButton,
+          withoutButtons: this.props.withoutButtons
+        })} />
+        <div className='bookmarkFormInner'>
           {
-            !this.isFolder
-            ? <div id='bookmarkLocation' className='formRow'>
-              <label data-l10n-id='locationField' htmlFor='bookmarkLocation' />
-              <input spellCheck='false' onKeyDown={this.onKeyDown} onChange={this.onLocationChange} value={this.props.currentDetail.get('location')} />
-            </div>
-            : null
+            !this.isFolder && this.props.shouldShowLocation
+            ? <h2 data-l10n-id='bookmarkEdit' />
+            : <h2 data-l10n-id='bookmarkAdded' />
           }
-          <div id='bookmarkParentFolder' className='formRow'>
-            <label data-l10n-id='parentFolderField' htmlFor='bookmarkParentFolderk' />
-            <select value={this.props.currentDetail.get('parentFolderId')}
-              onChange={this.onParentFolderChange} >
-              <option value='0' data-l10n-id='bookmarksToolbar' />
-              {
-                this.folders.map((folder) => <option value={folder.folderId}>{folder.label}</option>)
-              }
-            </select>
-          </div>
-          <div className='formRow'>
+          <div className='bookmarkFormTable'>
+            <div id='bookmarkName' className='bookmarkFormRow'>
+              <label data-l10n-id='nameField' htmlFor='bookmarkName' />
+              <input spellCheck='false' onKeyDown={this.onKeyDown} onChange={this.onNameChange} value={this.displayBookmarkName} ref={(bookmarkName) => { this.bookmarkName = bookmarkName }} />
+            </div>
             {
-              this.props.originalDetail
-              ? <a data-l10n-id='delete' className='removeBookmarkLink link' onClick={this.onRemoveBookmark} />
+              !this.isFolder && this.props.shouldShowLocation
+              ? <div id='bookmarkLocation' className='bookmarkFormRow'>
+                <label data-l10n-id='locationField' htmlFor='bookmarkLocation' />
+                <input spellCheck='false' onKeyDown={this.onKeyDown} onChange={this.onLocationChange} value={this.props.currentDetail.get('location')} />
+              </div>
               : null
             }
-            <Button l10nId='save' disabled={!this.bookmarkNameValid} className='primaryButton' onClick={this.onSave} />
+            <div id='bookmarkParentFolder' className='bookmarkFormRow'>
+              <label data-l10n-id='parentFolderField' htmlFor='bookmarkParentFolderk' />
+              <select value={this.props.currentDetail.get('parentFolderId')}
+                onChange={this.onParentFolderChange} >
+                <option value='0' data-l10n-id='bookmarksToolbar' />
+                {
+                  this.folders.map((folder) => <option value={folder.folderId}>{folder.label}</option>)
+                }
+              </select>
+            </div>
+            <div className='bookmarkButtons'>
+              {
+                this.props.originalDetail
+                ? <Button l10nId='remove' className='primaryButton whiteButton inlineButton' onClick={this.onRemoveBookmark} />
+                : null
+              }
+              <Button l10nId='done' disabled={!this.bookmarkNameValid} className='primaryButton' onClick={this.onSave} />
+            </div>
           </div>
         </div>
+        <div className='bookmarkFormFooter'>
+          <Button l10nId='viewBookmarks' onClick={this.onViewBookmarks} />
+        </div>
       </div>
-    </Dialog>
+    </div>
   }
 }
 
diff --git a/js/components/main.js b/js/components/main.js
index e4364831ec5..3776458ebed 100644
--- a/js/components/main.js
+++ b/js/components/main.js
@@ -32,7 +32,6 @@ const ClearBrowsingDataPanel = require('./clearBrowsingDataPanel')
 const ImportBrowserDataPanel = require('../../app/renderer/components/importBrowserDataPanel')
 const AutofillAddressPanel = require('./autofillAddressPanel')
 const AutofillCreditCardPanel = require('./autofillCreditCardPanel')
-const AddEditBookmark = require('./addEditBookmark')
 const LoginRequired = require('./loginRequired')
 const ReleaseNotes = require('./releaseNotes')
 const BookmarksToolbar = require('../../app/renderer/components/bookmarksToolbar')
@@ -667,7 +666,8 @@ class Main extends ImmutableComponent {
           (node.classList.contains('popupWindow') ||
             node.classList.contains('contextMenu') ||
             node.classList.contains('extensionButton') ||
-            node.classList.contains('menubarItem'))) {
+            node.classList.contains('menubarItem') ||
+            node.classList.contains('bookmarkForm'))) {
         // Middle click (on context menu) needs to fire the click event.
         // We need to prevent the default "Auto-Scrolling" behavior.
         if (node.classList.contains('contextMenu') && e.button === 1) {
@@ -919,6 +919,7 @@ class Main extends ImmutableComponent {
                 startLoadTime={activeFrame && activeFrame.get('startLoadTime') || undefined}
                 endLoadTime={activeFrame && activeFrame.get('endLoadTime') || undefined}
                 loading={activeFrame && activeFrame.get('loading')}
+                bookmarkDetail={this.props.windowState.get('bookmarkDetail')}
                 mouseInTitlebar={this.props.windowState.getIn(['ui', 'mouseInTitlebar'])}
                 searchDetail={this.props.windowState.get('searchDetail')}
                 enableNoScript={this.enableNoScript(activeSiteSettings)}
@@ -1003,14 +1004,6 @@ class Main extends ImmutableComponent {
             ? <LoginRequired loginRequiredDetail={loginRequiredDetail} tabId={activeFrame.get('tabId')} />
             : null
         }
-        {
-          this.props.windowState.get('bookmarkDetail')
-          ? <AddEditBookmark sites={this.props.appState.get('sites')}
-            currentDetail={this.props.windowState.getIn(['bookmarkDetail', 'currentDetail'])}
-            originalDetail={this.props.windowState.getIn(['bookmarkDetail', 'originalDetail'])}
-            destinationDetail={this.props.windowState.getIn(['bookmarkDetail', 'destinationDetail'])} />
-          : null
-        }
         {
           noScriptIsVisible
             ? <NoScriptInfo frameProps={activeFrame}
diff --git a/js/components/navigationBar.js b/js/components/navigationBar.js
index 4e0d109bf3f..0499a44f833 100644
--- a/js/components/navigationBar.js
+++ b/js/components/navigationBar.js
@@ -15,6 +15,7 @@ const messages = require('../constants/messages')
 const settings = require('../constants/settings')
 const ipc = global.require('electron').ipcRenderer
 const {isSourceAboutUrl} = require('../lib/appUrlUtil')
+const AddEditBookmark = require('./addEditBookmark')
 const siteUtil = require('../state/siteUtil')
 const eventUtil = require('../lib/eventUtil')
 const getSetting = require('../settings').getSetting
@@ -38,9 +39,10 @@ class NavigationBar extends ImmutableComponent {
   }
 
   onToggleBookmark () {
+    const editing = this.bookmarked
     // trigger the AddEditBookmark modal; saving/deleting takes place there
     const siteDetail = siteUtil.getDetailFromFrame(this.activeFrame, siteTags.BOOKMARK)
-    windowActions.setBookmarkDetail(siteDetail, siteDetail)
+    windowActions.setBookmarkDetail(siteDetail, siteDetail, null, editing)
   }
 
   onReload (e) {
@@ -73,6 +75,7 @@ class NavigationBar extends ImmutableComponent {
 
   get titleMode () {
     return this.props.mouseInTitlebar === false &&
+      !this.props.bookmarkDetail &&
       this.props.title &&
       !['about:blank', 'about:newtab'].includes(this.props.location) &&
       !this.loading &&
@@ -112,10 +115,23 @@ class NavigationBar extends ImmutableComponent {
       className={cx({
         titleMode: this.titleMode
       })}>
+      {
+        this.props.bookmarkDetail
+        ? <AddEditBookmark sites={this.props.sites}
+          currentDetail={this.props.bookmarkDetail.get('currentDetail')}
+          originalDetail={this.props.bookmarkDetail.get('originalDetail')}
+          destinationDetail={this.props.bookmarkDetail.get('destinationDetail')}
+          shouldShowLocation={this.props.bookmarkDetail.get('shouldShowLocation')}
+          withStopButton={!isSourceAboutUrl(this.props.location)}
+          withHomeButton={getSetting(settings.SHOW_HOME_BUTTON)}
+          withoutButtons={isSourceAboutUrl(this.props.location) && !getSetting(settings.SHOW_HOME_BUTTON)}
+          />
+        : null
+        }
       <div className='startButtons'>
         {
           isSourceAboutUrl(this.props.location) || this.titleMode
-          ? <span className='browserButton' />
+          ? null
           : this.loading
             ? <Button iconClass='fa-times'
               l10nId='stopButton'
@@ -134,6 +150,17 @@ class NavigationBar extends ImmutableComponent {
             onClick={this.onHome} />
           : null
         }
+        <Button iconClass={this.bookmarked ? 'fa-star' : 'fa-star-o'}
+          className={cx({
+            navbutton: true,
+            bookmarkButton: true,
+            removeBookmarkButton: this.bookmarked,
+            withStopButton: !isSourceAboutUrl(this.props.location),
+            withHomeButton: getSetting(settings.SHOW_HOME_BUTTON),
+            withoutButtons: isSourceAboutUrl(this.props.location) && !getSetting(settings.SHOW_HOME_BUTTON)
+          })}
+          l10nId={this.bookmarked ? 'removeBookmarkButton' : 'addBookmarkButton'}
+          onClick={this.onToggleBookmark} />
       </div>
       <UrlBar ref='urlBar'
         sites={this.props.sites}
@@ -168,14 +195,6 @@ class NavigationBar extends ImmutableComponent {
               })}
               onClick={this.onNoScript} />
           }
-          <Button iconClass={this.bookmarked ? 'fa-star' : 'fa-star-o'}
-            className={cx({
-              navbutton: true,
-              bookmarkButton: true,
-              removeBookmarkButton: this.bookmarked
-            })}
-            l10nId={this.bookmarked ? 'removeBookmarkButton' : 'addBookmarkButton'}
-            onClick={this.onToggleBookmark} />
         </div>
       }
     </div>
diff --git a/js/constants/windowConstants.js b/js/constants/windowConstants.js
index 16cf9a0a6a2..2da41ade7d5 100644
--- a/js/constants/windowConstants.js
+++ b/js/constants/windowConstants.js
@@ -46,6 +46,7 @@ const windowConstants = {
   WINDOW_SET_BOOKMARK_DETAIL: _, // If set, also indicates that add/edit is shown
   WINDOW_SET_CONTEXT_MENU_DETAIL: _, // If set, also indicates that the context menu is shown
   WINDOW_SET_POPUP_WINDOW_DETAIL: _, // If set, also indicates that the popup window is shown
+  WINDOW_TOGGLE_BOOKMARK_HANGER: _,
   WINDOW_SET_AUDIO_MUTED: _,
   WINDOW_SET_AUDIO_PLAYBACK_ACTIVE: _,
   WINDOW_SET_FAVICON: _,
diff --git a/js/contextMenus.js b/js/contextMenus.js
index 296629458af..91925f9c607 100644
--- a/js/contextMenus.js
+++ b/js/contextMenus.js
@@ -50,7 +50,7 @@ const addBookmarkMenuItem = (label, siteDetail, closestDestinationDetail, isPare
       if (isParent) {
         siteDetail = siteDetail.set('parentFolderId', closestDestinationDetail && (closestDestinationDetail.get('folderId') || closestDestinationDetail.get('parentFolderId')))
       }
-      windowActions.setBookmarkDetail(siteDetail, siteDetail, closestDestinationDetail)
+      windowActions.setBookmarkDetail(siteDetail, siteDetail, closestDestinationDetail, false)
     }
   }
 }
@@ -63,7 +63,7 @@ const addFolderMenuItem = (closestDestinationDetail, isParent) => {
       if (isParent) {
         emptyFolder = emptyFolder.set('parentFolderId', closestDestinationDetail && (closestDestinationDetail.get('folderId') || closestDestinationDetail.get('parentFolderId')))
       }
-      windowActions.setBookmarkDetail(emptyFolder, undefined, closestDestinationDetail)
+      windowActions.setBookmarkDetail(emptyFolder, undefined, closestDestinationDetail, false)
     }
   }
 }
@@ -285,7 +285,7 @@ function siteDetailTemplateInit (siteDetail, activeFrame) {
       template.push(
         {
           label: locale.translation(isFolder ? 'editFolder' : 'editBookmark'),
-          click: () => windowActions.setBookmarkDetail(siteDetail, siteDetail)
+          click: () => windowActions.setBookmarkDetail(siteDetail, siteDetail, null, true)
         },
         CommonMenu.separatorMenuItem)
     }
diff --git a/js/stores/windowStore.js b/js/stores/windowStore.js
index 318ccdf7c69..9fe070bba8a 100644
--- a/js/stores/windowStore.js
+++ b/js/stores/windowStore.js
@@ -599,7 +599,8 @@ const doAction = (action) => {
         windowState = windowState.mergeIn(['bookmarkDetail'], {
           currentDetail: action.currentDetail,
           originalDetail: action.originalDetail,
-          destinationDetail: action.destinationDetail
+          destinationDetail: action.destinationDetail,
+          shouldShowLocation: action.shouldShowLocation
         })
       }
       // Since the input values of bookmarks are bound, we need to notify the controls sync.
@@ -811,8 +812,12 @@ const doAction = (action) => {
         windowState = windowState.setIn(['ui', 'menubar', 'isVisible'], newVisibleStatus)
       }
       break
+    case WindowConstants.WINDOW_TOGGLE_BOOKMARK_HANGER:
+      windowState = windowState.delete('bookmarkDetail')
+      break
     case WindowConstants.WINDOW_RESET_MENU_STATE:
       doAction({actionType: WindowConstants.WINDOW_SET_POPUP_WINDOW_DETAIL})
+      doAction({actionType: WindowConstants.WINDOW_TOGGLE_BOOKMARK_HANGER})
       if (getSetting(settings.AUTO_HIDE_MENU)) {
         doAction({actionType: WindowConstants.WINDOW_TOGGLE_MENUBAR_VISIBLE, isVisible: false})
       } else {
diff --git a/less/forms.less b/less/forms.less
index 9fb0ddf4e81..f84c8bcc1f3 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -407,6 +407,98 @@
   text-overflow: ellipsis;
 }
 
+.dialog.bookmarkDialog {
+  justify-content: initial;
+  padding-left: 7px;
+}
+
+#navigator {
+  .bookmarkForm {
+    .genericForm;
+    background: linear-gradient(#FFFFFF, #DEDEDE);
+    margin-top: 10px;
+    padding: 0;
+
+    .arrowUp {
+      width: 0;
+      height: 0;
+      border-left: 10px solid transparent;
+      border-right: 10px solid transparent;
+      border-bottom: 10px solid #FFFFFF;
+      position: relative;
+      bottom: 10px;
+      left: 37px;
+
+      &.withoutButtons {
+        left: 6px;
+      }
+
+      &.withStopButton {
+        &.withHomeButton {
+          left: 67px;
+        }
+      }
+    }
+
+    .bookmarkFormRow {
+      margin-bottom: 10px;
+    }
+
+    .bookmarkButtons {
+      margin: 20px 0 10px 0;
+    }
+
+    .bookmarkFormInner {
+      padding: 10px 30px;
+    }
+
+    label {
+      color: @darkGray;
+      margin-left: 5px;
+    }
+
+    h2 {
+      color: @braveOrange;
+      font-weight: normal;
+      font-size: 16px;
+    }
+
+    input,
+    select {
+      display: block;
+      width: 100%;
+      max-width: 250px;
+      height: 25px;
+      border-radius: 5px;
+      padding: 0 5px;
+      margin: 5px 0 5px 0;
+      font-size: 0.9em;
+      border: solid 1px #ececec;
+      background: white;
+      color: #444444;
+      outline: none;
+    }
+
+    input {
+      box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+    }
+
+    select {
+      box-shadow: 0px 1px 5px -1px rgba(0, 0, 0, 0.8);
+    }
+  }
+
+  .bookmarkFormFooter {
+    background: @gray;
+    padding: 10px 30px;
+
+    span {
+      font-size: 12px;
+      text-align: left;
+    }
+  }
+}
+
 .genericForm {
   .flyoutDialog;
   display: table;
diff --git a/less/navigationBar.less b/less/navigationBar.less
index 4d58eb4e64d..96bc7e1730e 100644
--- a/less/navigationBar.less
+++ b/less/navigationBar.less
@@ -45,6 +45,11 @@
     padding-left: 5px;
   }
 
+  .startButtons {
+    position: relative;
+    top: -1px;
+  }
+
   #urlInput { width: 100%; }
 
   // changes to ensure window can be as small as 480px wide
@@ -591,6 +596,8 @@
   #navigator:not(.titleMode) & {
     background: white;
     border-radius: @borderRadiusURL;
+    border-top-left-radius: 0;
+    border-bottom-left-radius: 0;
     box-shadow: inset 0 0 0 1px rgba(0,0,0,0.1), inset 0 1px 0 rgba(0,0,0,0.05), inset 0 1px 1px rgba(0,0,0,0.1);
     color: @chromeText;
   }
@@ -623,6 +630,22 @@
       opacity: 0;
       animation-fill-mode: forwards;
     }
+
+    .bookmarkButton {
+      border: 1px solid #CBCBCB;
+      border-right: none;
+      border-top-right-radius: 0;
+      border-bottom-right-radius: 0;
+      box-sizing: border-box;
+      height: 25px;
+      line-height: 25px;
+      margin-top: 2px;
+      margin-right: -2px;
+
+      &.withoutButtons {
+        margin-bottom: 2px;
+      }
+    }
   }
 
   &.titleMode {