diff --git a/src/controls/templates/private/BackButton.qml b/src/controls/templates/private/BackButton.qml
index 1eea35e9..86632de6 100644
--- a/src/controls/templates/private/BackButton.qml
+++ b/src/controls/templates/private/BackButton.qml
@@ -1,61 +1,55 @@
 /*
  *   Copyright 2016 Marco Martin <mart@kde.org>
  *
  *   This program is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU Library General Public License as
  *   published by the Free Software Foundation; either version 2, or
  *   (at your option) any later version.
  *
  *   This program is distributed in the hope that it will be useful,
  *   but WITHOUT ANY WARRANTY; without even the implied warranty of
  *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *   GNU Library General Public License for more details
  *
  *   You should have received a copy of the GNU Library General Public
  *   License along with this program; if not, write to the
  *   Free Software Foundation, Inc.,
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
 import QtQuick 2.1
 import QtQuick.Controls 2.0 as Controls
 
 import org.kde.kirigami 2.2
 
 Controls.ToolButton {
     id: button
-    anchors {
-        top: parent.top
-        bottom: parent.bottom
-        margins: 4
-        left: parent.left
-    }
-    width: visible ? height : 0
+
     z: 99
     enabled: !Settings.isMobile && (__appWindow.pageStack.currentIndex > 0 || applicationWindow().pageStack.contentItem.contentX > 0)
     implicitWidth: height
     visible: applicationWindow().pageStack.contentItem.contentWidth > applicationWindow().pageStack.width
 
     onClicked: {
         if (applicationWindow().pageStack.layers && applicationWindow().pageStack.layers.depth > 1) {
             applicationWindow().pageStack.layers.pop();
         } else {
             applicationWindow().pageStack.goBack();
         }
     }
     Icon {
         anchors.centerIn: parent
         width: Math.min(parent.width, Units.iconSizes.smallMedium)
         height: width
         opacity: parent.enabled ? 1 : 0.6
         selected: header.background && header.background.color && header.background.color == Theme.highlightColor
         source: (LayoutMirroring.enabled ? "go-previous-symbolic-rtl" : "go-previous-symbolic")
     }
     Controls.ToolTip {
         visible: button.hovered
         text: qsTr("Navigate Back")
         delay: 1000
         timeout: 5000
         y: button.height
     }
 }
diff --git a/src/controls/templates/private/ForwardButton.qml b/src/controls/templates/private/ForwardButton.qml
index 286eed88..71bc8a37 100644
--- a/src/controls/templates/private/ForwardButton.qml
+++ b/src/controls/templates/private/ForwardButton.qml
@@ -1,56 +1,50 @@
 /*
  *   Copyright 2016 Marco Martin <mart@kde.org>
  *
  *   This program is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU Library General Public License as
  *   published by the Free Software Foundation; either version 2, or
  *   (at your option) any later version.
  *
  *   This program is distributed in the hope that it will be useful,
  *   but WITHOUT ANY WARRANTY; without even the implied warranty of
  *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *   GNU Library General Public License for more details
  *
  *   You should have received a copy of the GNU Library General Public
  *   License along with this program; if not, write to the
  *   Free Software Foundation, Inc.,
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
 import QtQuick 2.1
 import QtQuick.Controls 2.0 as Controls
 
 import org.kde.kirigami 2.2
 
 Controls.ToolButton {
     id: button
-    anchors {
-        top: parent.top
-        bottom: parent.bottom
-        margins: 4
-    }
-    width: visible ? height : 0
     z: 99
 
     property Flickable headerFlickable
     implicitWidth: height
     visible: headerFlickable.internalHeaderStyle == ApplicationHeaderStyle.Titles && !applicationWindow().pageStack.contentItem.atXEnd && applicationWindow().pageStack.layers.depth < 2
 
     onClicked: applicationWindow().pageStack.goForward();
 
     Icon {
         anchors.centerIn: parent
         width: Math.min(parent.width, Units.iconSizes.smallMedium)
         height: width
         opacity: parent.enabled ? 1 : 0.6
         selected: header.background && header.background.color && header.background.color == Theme.highlightColor
         source: (LayoutMirroring.enabled ? "go-next-symbolic-rtl" : "go-next-symbolic")
     }
     Controls.ToolTip {
         visible: button.hovered
         text: qsTr("Navigate Forward")
         delay: 1000
         timeout: 5000
         y: button.height
     }
 }