diff --git a/app/renderer/components/bookmarks/bookmarksToolbar.js b/app/renderer/components/bookmarks/bookmarksToolbar.js
index 77e6e3317e7..6045d1a1bc0 100644
--- a/app/renderer/components/bookmarks/bookmarksToolbar.js
+++ b/app/renderer/components/bookmarks/bookmarksToolbar.js
@@ -209,13 +209,14 @@ const styles = StyleSheet.create({
     boxSizing: 'border-box',
     display: 'flex',
     flex: 1,
-    padding: `${globalStyles.spacing.navbarMenubarMargin} ${globalStyles.spacing.bookmarksToolbarPadding}`
+    padding: `0 ${globalStyles.spacing.bookmarksToolbarPadding}`,
+    margin: `${globalStyles.spacing.navbarMenubarMargin} 0`
   },
   bookmarksToolbar__allowDragging: {
     WebkitAppRegion: 'drag'
   },
   bookmarksToolbar__showOnlyFavicon: {
-    padding: `${globalStyles.spacing.navbarMenubarMargin} 0 ${globalStyles.spacing.tabPagesHeight} ${globalStyles.spacing.bookmarksToolbarPadding}`
+    padding: `0 0 0 ${globalStyles.spacing.bookmarksToolbarPadding}`
   },
   bookmarksToolbar__bookmarkButton: {
     boxSizing: 'border-box',
diff --git a/app/renderer/components/main/main.js b/app/renderer/components/main/main.js
index 14294044d7d..cd7e63ebb89 100644
--- a/app/renderer/components/main/main.js
+++ b/app/renderer/components/main/main.js
@@ -690,18 +690,22 @@ class Main extends React.Component {
           ? <BookmarksToolbar />
           : null
         }
-        <div className={cx({
-          tabPages: true,
-          allowDragging: this.props.shouldAllowWindowDrag,
-          singlePage: this.props.isSinglePage
-        })}
-          onContextMenu={this.onTabContextMenu}>
-          {
-            this.props.showTabPages
-            ? <TabPages />
-            : null
-          }
-        </div>
+        {
+          this.props.isSinglePage
+          ? null
+          : <div className={cx({
+            tabPages: true,
+            allowDragging: this.props.shouldAllowWindowDrag,
+            singlePage: this.props.isSinglePage
+          })}
+            onContextMenu={this.onTabContextMenu}>
+            {
+              this.props.showTabPages
+              ? <TabPages />
+              : null
+            }
+          </div>
+        }
         <TabsToolbar key='tab-bar' />
         {
           this.props.showNotificationBar
diff --git a/less/navigationBar.less b/less/navigationBar.less
index 222cf274e4e..2ec09a9246e 100644
--- a/less/navigationBar.less
+++ b/less/navigationBar.less
@@ -359,7 +359,7 @@
 // Styles had to be reworked to properly position the new caption buttons for Windows
 .navbarCaptionButtonContainer {
   display: flex;
-  //border-bottom: 1px solid #bbb;
+  margin-bottom: @navbarMenubarMargin;
 
   &.allowDragging {
     -webkit-app-region: drag;
diff --git a/less/tabs.less b/less/tabs.less
index 9ebbdf0e37f..c0d429e2f11 100644
--- a/less/tabs.less
+++ b/less/tabs.less
@@ -143,7 +143,7 @@
   display: flex;
   justify-content: center;
   height: @tabPagesHeight;
-  padding: @tabPagesHeight 0 @navbarMenubarMargin 0;
+  margin: @navbarMenubarMargin 0 @navbarMenubarMargin 0;
   position: relative;
   z-index: @zindexTabs;
 
@@ -154,11 +154,6 @@
     }
   }
 
-  &.singlePage {
-    margin: 0;
-    padding: 0;
-  }
-
   >div {
     display: flex
   }