diff --git a/src/ViewContainer.cpp b/src/ViewContainer.cpp
--- a/src/ViewContainer.cpp
+++ b/src/ViewContainer.cpp
@@ -70,7 +70,7 @@
     setMovable(true);
     connect(tabBarWidget, &DetachableTabBar::moveTabToWindow, this, &TabbedViewContainer::moveTabToWindow);
     tabBar()->setContextMenuPolicy(Qt::CustomContextMenu);
-    _newTabButton->setIcon(QIcon::fromTheme(QStringLiteral("document-new")));
+    _newTabButton->setIcon(QIcon::fromTheme(QStringLiteral("tab-new")));
     _newTabButton->setAutoRaise(true);
     connect(_newTabButton, &QToolButton::clicked, this, [this]{
         emit newViewRequest(this);
@@ -103,6 +103,8 @@
         }
     });
 
+    connect(tabBar(), &QTabBar::tabCloseRequested, this, &TabbedViewContainer::closeTerminalTab);
+
 #if defined(ENABLE_DETACHING)
     auto detachAction = _contextPopupMenu->addAction(
         QIcon::fromTheme(QStringLiteral("tab-detach")),
@@ -188,15 +190,16 @@
 
     setTabPosition((QTabWidget::TabPosition) KonsoleSettings::tabBarPosition());
 
-    setCornerWidget( KonsoleSettings::showQuickButtons() ? _newTabButton : nullptr, Qt::TopLeftCorner);
-    setCornerWidget( KonsoleSettings::showQuickButtons() ? _closeTabButton : nullptr, Qt::TopRightCorner);
+    setCornerWidget(KonsoleSettings::newTabButton() ? _newTabButton : nullptr, Qt::TopLeftCorner);
+    _newTabButton->setVisible(KonsoleSettings::newTabButton());
+
+    setCornerWidget(KonsoleSettings::closeTabButton() == 1 ? _closeTabButton : nullptr, Qt::TopRightCorner);
+    _closeTabButton->setVisible(KonsoleSettings::closeTabButton() == 1);
+
+    tabBar()->setTabsClosable(KonsoleSettings::closeTabButton() == 0);
 
     tabBar()->setExpanding(KonsoleSettings::expandTabWidth());
     tabBar()->update();
-    if (isVisible() && KonsoleSettings::showQuickButtons()) {
-        _newTabButton->setVisible(true);
-        _closeTabButton->setVisible(true);
-    }
 
     if (KonsoleSettings::tabBarUseUserStyleSheet()) {
         setCssFromFile(KonsoleSettings::tabBarUserStyleSheetFile());
diff --git a/src/settings/TabBarSettings.ui b/src/settings/TabBarSettings.ui
--- a/src/settings/TabBarSettings.ui
+++ b/src/settings/TabBarSettings.ui
@@ -62,60 +62,95 @@
         </property>
        </widget>
       </item>
-      <item row="3" column="0" colspan="2">
-       <widget class="QCheckBox" name="kcfg_ExpandTabWidth">
-        <property name="text">
-         <string>Expand Individual Tab Widths to Full Window</string>
-        </property>
-       </widget>
-      </item>
-      <item row="4" column="2">
-       <widget class="KUrlRequester" name="kcfg_TabBarUserStyleSheetFile">
+      <item row="1" column="1" colspan="2">
+       <widget class="KComboBox" name="kcfg_TabBarPosition">
         <property name="sizePolicy">
          <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-          <horstretch>2</horstretch>
+          <horstretch>1</horstretch>
           <verstretch>0</verstretch>
          </sizepolicy>
         </property>
-        <property name="filter" stdset="0">
-         <string>text/css</string>
-        </property>
+        <item>
+         <property name="text">
+          <string>Above Terminal Area</string>
+         </property>
+        </item>
+        <item>
+         <property name="text">
+          <string>Below Terminal Area</string>
+         </property>
+        </item>
        </widget>
       </item>
-      <item row="2" column="0" colspan="3">
-       <widget class="QCheckBox" name="kcfg_ShowQuickButtons">
+      <item row="2" column="0">
+       <widget class="QLabel" name="label_CloseTabButton">
         <property name="text">
-         <string>Show 'New Tab' and 'Close Tab' buttons</string>
+         <string>Close Tab button:</string>
         </property>
-       </widget>
-      </item>
-      <item row="4" column="0" colspan="2">
-       <widget class="QCheckBox" name="kcfg_TabBarUseUserStyleSheet">
-        <property name="text">
-         <string>Use user-defined stylesheet</string>
+        <property name="alignment">
+         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
         </property>
        </widget>
       </item>
-      <item row="1" column="1" colspan="2">
-       <widget class="KComboBox" name="kcfg_TabBarPosition">
+      <item row="2" column="1" colspan="2">
+       <widget class="KComboBox" name="kcfg_CloseTabButton">
         <property name="sizePolicy">
          <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
           <horstretch>1</horstretch>
           <verstretch>0</verstretch>
          </sizepolicy>
         </property>
         <item>
          <property name="text">
-          <string>Above Terminal Area</string>
+          <string>On each tab</string>
          </property>
         </item>
         <item>
          <property name="text">
-          <string>Below Terminal Area</string>
+          <string>On the tab bar</string>
+         </property>
+        </item>
+        <item>
+         <property name="text">
+          <string>None</string>
          </property>
         </item>
        </widget>
       </item>
+      <item row="3" column="0" colspan="3">
+       <widget class="QCheckBox" name="kcfg_NewTabButton">
+        <property name="text">
+         <string>Show 'New Tab' button</string>
+        </property>
+       </widget>
+      </item>
+      <item row="4" column="0" colspan="2">
+       <widget class="QCheckBox" name="kcfg_ExpandTabWidth">
+        <property name="text">
+         <string>Expand Individual Tab Widths to Full Window</string>
+        </property>
+       </widget>
+      </item>
+      <item row="5" column="2">
+       <widget class="KUrlRequester" name="kcfg_TabBarUserStyleSheetFile">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+          <horstretch>2</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="filter" stdset="0">
+         <string>text/css</string>
+        </property>
+       </widget>
+      </item>
+      <item row="5" column="0" colspan="2">
+       <widget class="QCheckBox" name="kcfg_TabBarUseUserStyleSheet">
+        <property name="text">
+         <string>Use user-defined stylesheet</string>
+        </property>
+       </widget>
+      </item>
      </layout>
     </widget>
    </item>
diff --git a/src/settings/konsole.kcfg b/src/settings/konsole.kcfg
--- a/src/settings/konsole.kcfg
+++ b/src/settings/konsole.kcfg
@@ -91,10 +91,19 @@
       <label>The .css file to use for the tab bar style</label>
       <default></default>
     </entry>
-    <entry name="ShowQuickButtons" type="Bool">
-      <label>Control the visibility of quick buttons on the tab bar</label>
+    <entry name="NewTabButton" type="Bool">
+      <label>Control the visibility of 'New Tab' button on the tab bar</label>
       <default>false</default>
     </entry>
+    <entry name="CloseTabButton" type="Enum">
+      <label>Control where the "Close tab" button will be displayed</label>
+      <choices>
+        <choice name="OnEachTab" />
+        <choice name="OnTabBar" />
+        <choice name="None" />
+      </choices>
+      <default>OnEachTab</default>
+    </entry>
     <entry name="NewTabBehavior" type="Enum">
       <label>Control where to put the new tab</label>
       <choices>