diff --git a/lib/components/button-group.vue b/lib/components/button-group.vue
index 6219472f497..9d80ac9d9b6 100755
--- a/lib/components/button-group.vue
+++ b/lib/components/button-group.vue
@@ -1,42 +1,19 @@
 <template>
-    <div :class="classObject"
-         :role="toolbar ? 'toolbar' : 'group'"
-         :tabindex="isKeyNav ? '0' : null"
-         @focusin.self="focusFirst"
-         @keydown.left="focusNext($event,true)"
-         @keydown.up="focusNext($event,true)"
-         @keydown.right="focusNext($event,false)"
-         @keydown.down="focusNext($event,false)"
-         @keydown.shift.left="focusFirst($event)"
-         @keydown.shift.up="focusFirst($event)"
-         @keydown.shift.right="focusLast($event)"
-         @keydown.shift.down="focusLast($event)"
-    >
+    <div :class="classObject">
         <slot></slot>
     </div>
 </template>
 
 <script>
-    const ITEM_SELECTOR = [
-        '.btn:not(.disabled):not([disabled]):not([style*="display: none"]):not([style*="display:none"])',
-        '.form-control:not(.disabled):not([disabled]):not([style*="display: none"]):not([style*="display:none"])',
-        'select:not(.disabled):not([disabled]):not([style*="display: none"]):not([style*="display:none"])',
-        'input[type="checkbox"]:not(.disabled):not([disabled]):not([style*="display: none"]):not([style*="display:none"])',
-        'input[type="radio"]:not(.disabled):not([disabled]):not([style*="display: none"]):not([style*="display:none"])'
-    ].join(',');
-
     export default {
         computed: {
             classObject() {
                 return [
-                    'btn-' + (this.toolbar ? 'toolbar' : 'group'),
+                    'btn-group',
                     this.vertical ? 'btn-group-vertical' : '',
                     (this.justify && !this.vertical) ? 'justify-content-between' : '',
                     this.size ? ('btn-group-' + this.size) : ''
                 ];
-            },
-            isKeyNav() {
-                return this.toolbar && this.toolbarKeyNav;
             }
         },
         props: {
@@ -44,10 +21,6 @@
                 type: Boolean,
                 default: false
             },
-            toolbar: {
-                type: Boolean,
-                default: false
-            },
             justify: {
                 type: Boolean,
                 default: false
@@ -55,69 +28,6 @@
             size: {
                 type: String,
                 default: null
-            },
-            toolbarKeyNav: {
-                type: Boolean,
-                default: false
-            }
-        },
-        methods: {
-            focusNext(e, prev) {
-                if (!this.isKeyNav) {
-                    return;
-                }
-                e.preventDefault();
-                e.stopPropagation();
-                const items = this.getItems();
-                if (items.length < 1) {
-                    return;
-                }
-                let index = items.indexOf(e.target);
-                if (prev && index > 0) {
-                    index--;
-                } else if (!prev && index < items.length - 1) {
-                    index++;
-                }
-                if (index < 0) {
-                    index = 0;
-                }
-                items[index].focus();
-            },
-            focusFirst(e) {
-                if (!this.isKeyNav) {
-                    return;
-                }
-                e.preventDefault();
-                e.stopPropagation();
-                const items = this.getItems();
-                if (items.length > 0) {
-                    items[0].focus();
-                }
-            },
-            focusLast(e) {
-                if (!this.isKeyNav) {
-                    return;
-                }
-                e.preventDefault();
-                e.stopPropagation();
-                const items = this.getItems();
-                if (items.length > 0) {
-                    items[items.length - 1].focus();
-                }
-            },
-            getItems() {
-                const items = Array.prototype.slice.call(this.$el.querySelectorAll(ITEM_SELECTOR));
-                items.forEach(item => {
-                    // Ensure tabfocus is -1 on any new elements
-                    item.tabIndex = -1;
-                });
-                return items;
-            }
-        },
-        mounted() {
-            if (this.isKeyNav) {
-                // Pre-set the tabindexes if the markup does not include tabindex="-1" on the toolbar items
-                this.getItems();
             }
         }
     };
diff --git a/lib/components/button-toolbar.vue b/lib/components/button-toolbar.vue
new file mode 100644
index 00000000000..49f8d10d520
--- /dev/null
+++ b/lib/components/button-toolbar.vue
@@ -0,0 +1,107 @@
+<template>
+    <div :class="classObject"
+         role="toolbar"
+         :tabindex="keyNav ? '0' : null"
+         @focusin.self="focusFirst"
+         @keydown.left="focusNext($event,true)"
+         @keydown.up="focusNext($event,true)"
+         @keydown.right="focusNext($event,false)"
+         @keydown.down="focusNext($event,false)"
+         @keydown.shift.left="focusFirst($event)"
+         @keydown.shift.up="focusFirst($event)"
+         @keydown.shift.right="focusLast($event)"
+         @keydown.shift.down="focusLast($event)"
+    >
+        <slot></slot>
+    </div>
+</template>
+
+<script>
+    const ITEM_SELECTOR = [
+        '.btn:not(.disabled):not([disabled]):not([style*="display: none"]):not([style*="display:none"])',
+        '.form-control:not(.disabled):not([disabled]):not([style*="display: none"]):not([style*="display:none"])',
+        'select:not(.disabled):not([disabled]):not([style*="display: none"]):not([style*="display:none"])',
+        'input[type="checkbox"]:not(.disabled):not([disabled]):not([style*="display: none"]):not([style*="display:none"])',
+        'input[type="radio"]:not(.disabled):not([disabled]):not([style*="display: none"]):not([style*="display:none"])'
+    ].join(',');
+
+    export default {
+        computed: {
+            classObject() {
+                return [
+                    'btn-toolbar',
+                    (this.justify && !this.vertical) ? 'justify-content-between' : ''
+                ];
+            }
+        },
+        props: {
+            justify: {
+                type: Boolean,
+                default: false
+            },
+            KeyNav: {
+                type: Boolean,
+                default: false
+            }
+        },
+        methods: {
+            focusNext(e, prev) {
+                if (!this.keyNav) {
+                    return;
+                }
+                e.preventDefault();
+                e.stopPropagation();
+                const items = this.getItems();
+                if (items.length < 1) {
+                    return;
+                }
+                let index = items.indexOf(e.target);
+                if (prev && index > 0) {
+                    index--;
+                } else if (!prev && index < items.length - 1) {
+                    index++;
+                }
+                if (index < 0) {
+                    index = 0;
+                }
+                items[index].focus();
+            },
+            focusFirst(e) {
+                if (!this.keyNav) {
+                    return;
+                }
+                e.preventDefault();
+                e.stopPropagation();
+                const items = this.getItems();
+                if (items.length > 0) {
+                    items[0].focus();
+                }
+            },
+            focusLast(e) {
+                if (!this.keyNav) {
+                    return;
+                }
+                e.preventDefault();
+                e.stopPropagation();
+                const items = this.getItems();
+                if (items.length > 0) {
+                    items[items.length - 1].focus();
+                }
+            },
+            getItems() {
+                const items = Array.prototype.slice.call(this.$el.querySelectorAll(ITEM_SELECTOR));
+                items.forEach(item => {
+                    // Ensure tabfocus is -1 on any new elements
+                    item.tabIndex = -1;
+                });
+                return items;
+            }
+        },
+        mounted() {
+            if (this.keyNav) {
+                // Pre-set the tabindexes if the markup does not include tabindex="-1" on the toolbar items
+                this.getItems();
+            }
+        }
+    };
+</script>
diff --git a/lib/components/index.js b/lib/components/index.js
index 5332e4aede0..e0943aee9e3 100755
--- a/lib/components/index.js
+++ b/lib/components/index.js
@@ -1,6 +1,7 @@
 import bAlert from './alert.vue';
 import bBreadcrumb from './breadcrumb.vue';
 import bButton from './button.vue';
+import bButtonToolbar from './button-toolbar.vue';
 import bButtonGroup from './button-group.vue';
 import bButtonGroupDropdown from './button-group-dropdown.vue';
 import bInputGroup from './input-group.vue';
@@ -49,6 +50,7 @@ export {
     bBreadcrumb,
     bButton,
     bButton as bBtn,
+    bButtonToolbar,
     bButtonGroup,
     bButtonGroupDropdown,
     bInputGroup,