diff --git a/administrator/components/com_content/tmpl/article/pagebreak.php b/administrator/components/com_content/tmpl/article/pagebreak.php
index 890531b0f6ade..8163f75a13d93 100644
--- a/administrator/components/com_content/tmpl/article/pagebreak.php
+++ b/administrator/components/com_content/tmpl/article/pagebreak.php
@@ -41,7 +41,7 @@
 			</div>
 		</div>
 
-		<button onclick="insertPagebreak('<?php echo $this->eName; ?>');" class="btn btn-success pull-xs-right">
+		<button onclick="insertPagebreak('<?php echo $this->eName; ?>');" class="btn btn-success">
 			<?php echo Text::_('COM_CONTENT_PAGEBREAK_INSERT_BUTTON'); ?>
 		</button>
 
diff --git a/administrator/components/com_installer/tmpl/update/default.php b/administrator/components/com_installer/tmpl/update/default.php
index 0bf8800d83f03..30ee0bf5524d0 100644
--- a/administrator/components/com_installer/tmpl/update/default.php
+++ b/administrator/components/com_installer/tmpl/update/default.php
@@ -106,7 +106,7 @@
 									</td>
 									<td class="hidden-sm-down text-center">
 										<?php if ($item->changelogurl !== null) : ?>
-                                        <a href="#changelogModal" class="btn btn-info btn-xs" onclick="Joomla.loadChangelog(<?php echo $item->extension_id; ?>, 'update'); return false;" data-toggle="modal">
+                                        <a href="#changelogModal" class="btn btn-info btn-sm" onclick="Joomla.loadChangelog(<?php echo $item->extension_id; ?>, 'update'); return false;" data-toggle="modal">
 	                                        <?php echo Text::_('COM_INSTALLER_CHANGELOG'); ?>
                                         </a>
 										<?php
diff --git a/components/com_contact/tmpl/categories/default_items.php b/components/com_contact/tmpl/categories/default_items.php
index 9218a9fbd2208..5cf52865ec11b 100644
--- a/components/com_contact/tmpl/categories/default_items.php
+++ b/components/com_contact/tmpl/categories/default_items.php
@@ -30,7 +30,7 @@
 					<?php endif; ?>
 					<?php if ($this->maxLevelcat > 1 && count($item->getChildren()) > 0) : ?>
 						<a id="category-btn-<?php echo $item->id; ?>" href="#category-<?php echo $item->id; ?>"
-							data-toggle="collapse" data-toggle="button" class="btn btn-xs float-right" aria-label="<?php echo Text::_('JGLOBAL_EXPAND_CATEGORIES'); ?>"><span class="icon-plus" aria-hidden="true"></span></a>
+							data-toggle="collapse" data-toggle="button" class="btn btn-sm float-right" aria-label="<?php echo Text::_('JGLOBAL_EXPAND_CATEGORIES'); ?>"><span class="icon-plus" aria-hidden="true"></span></a>
 					<?php endif; ?>
 				</h3>
 				<?php if ($this->params->get('show_subcat_desc_cat') == 1) : ?>
diff --git a/components/com_content/tmpl/categories/default_items.php b/components/com_content/tmpl/categories/default_items.php
index 169ddb8f695d5..7f5547401550e 100644
--- a/components/com_content/tmpl/categories/default_items.php
+++ b/components/com_content/tmpl/categories/default_items.php
@@ -33,7 +33,7 @@
 					<?php endif; ?>
 					<?php if (count($item->getChildren()) > 0 && $this->maxLevelcat > 1) : ?>
 						<a id="category-btn-<?php echo $item->id; ?>" href="#category-<?php echo $item->id; ?>"
-							data-toggle="collapse" data-toggle="button" class="btn btn-xs float-right" aria-label="<?php echo Text::_('JGLOBAL_EXPAND_CATEGORIES'); ?>"><span class="icon-plus" aria-hidden="true"></span></a>
+							data-toggle="collapse" data-toggle="button" class="btn btn-sm float-right" aria-label="<?php echo Text::_('JGLOBAL_EXPAND_CATEGORIES'); ?>"><span class="icon-plus" aria-hidden="true"></span></a>
 					<?php endif; ?>
 				</h3>
 				<?php if ($this->params->get('show_description_image') && $item->getParams()->get('image')) : ?>
diff --git a/components/com_content/tmpl/category/blog_children.php b/components/com_content/tmpl/category/blog_children.php
index 35eb35fe050dd..c13ec34738cf3 100644
--- a/components/com_content/tmpl/category/blog_children.php
+++ b/components/com_content/tmpl/category/blog_children.php
@@ -36,7 +36,7 @@
 					<?php echo $this->escape($child->title); ?></a>
 
 					<?php if ($this->maxLevel > 1 && count($child->getChildren()) > 0) : ?>
-						<a href="#category-<?php echo $child->id; ?>" data-toggle="collapse" data-toggle="button" class="btn btn-xs float-right" aria-label="<?php echo Text::_('JGLOBAL_EXPAND_CATEGORIES'); ?>"><span class="icon-plus" aria-hidden="true"></span></a>
+						<a href="#category-<?php echo $child->id; ?>" data-toggle="collapse" data-toggle="button" class="btn btn-sm float-right" aria-label="<?php echo Text::_('JGLOBAL_EXPAND_CATEGORIES'); ?>"><span class="icon-plus" aria-hidden="true"></span></a>
 					<?php endif; ?>
 				</h3>
 				<?php else : ?>
@@ -50,7 +50,7 @@
 					<?php endif; ?>
 
 					<?php if ($this->maxLevel > 1 && count($child->getChildren()) > 0) : ?>
-						<a href="#category-<?php echo $child->id; ?>" data-toggle="collapse" data-toggle="button" class="btn btn-xs float-right" aria-label="<?php echo Text::_('JGLOBAL_EXPAND_CATEGORIES'); ?>"><span class="icon-plus" aria-hidden="true"></span></a>
+						<a href="#category-<?php echo $child->id; ?>" data-toggle="collapse" data-toggle="button" class="btn btn-sm float-right" aria-label="<?php echo Text::_('JGLOBAL_EXPAND_CATEGORIES'); ?>"><span class="icon-plus" aria-hidden="true"></span></a>
 					<?php endif; ?>
 				</h3>
 				<?php endif; ?>
diff --git a/components/com_content/tmpl/category/default_children.php b/components/com_content/tmpl/category/default_children.php
index e925cd67cdf28..ae2b4e1d5eb00 100644
--- a/components/com_content/tmpl/category/default_children.php
+++ b/components/com_content/tmpl/category/default_children.php
@@ -36,7 +36,7 @@
 					<?php echo $this->escape($child->title); ?></a>
 
 					<?php if (count($child->getChildren()) > 0 && $this->maxLevel > 1) : ?>
-						<a href="#category-<?php echo $child->id; ?>" data-toggle="collapse" data-toggle="button" class="btn btn-xs float-right" aria-label="<?php echo Text::_('JGLOBAL_EXPAND_CATEGORIES'); ?>"><span class="icon-plus" aria-hidden="true"></span></a>
+						<a href="#category-<?php echo $child->id; ?>" data-toggle="collapse" data-toggle="button" class="btn btn-sm float-right" aria-label="<?php echo Text::_('JGLOBAL_EXPAND_CATEGORIES'); ?>"><span class="icon-plus" aria-hidden="true"></span></a>
 					<?php endif; ?>
 				</h3>
 				<?php else : ?>
@@ -49,7 +49,7 @@
 					<?php endif; ?>
 
 					<?php if (count($child->getChildren()) > 0 && $this->maxLevel > 1) : ?>
-						<a href="#category-<?php echo $child->id; ?>" data-toggle="collapse" data-toggle="button" class="btn btn-xs float-right" aria-label="<?php echo Text::_('JGLOBAL_EXPAND_CATEGORIES'); ?>"><span class="icon-plus" aria-hidden="true"></span></a>
+						<a href="#category-<?php echo $child->id; ?>" data-toggle="collapse" data-toggle="button" class="btn btn-sm float-right" aria-label="<?php echo Text::_('JGLOBAL_EXPAND_CATEGORIES'); ?>"><span class="icon-plus" aria-hidden="true"></span></a>
 					<?php endif; ?>
 				</h3>
 				<?php endif; ?>
diff --git a/components/com_newsfeeds/tmpl/categories/default_items.php b/components/com_newsfeeds/tmpl/categories/default_items.php
index e9c47b143c978..541359e1f2faa 100644
--- a/components/com_newsfeeds/tmpl/categories/default_items.php
+++ b/components/com_newsfeeds/tmpl/categories/default_items.php
@@ -31,7 +31,7 @@
 					<?php endif; ?>
 					<?php if (count($item->getChildren()) > 0 && $this->maxLevelcat > 1) : ?>
 						<a id="category-btn-<?php echo $item->id; ?>" href="#category-<?php echo $item->id; ?>"
-							data-toggle="collapse" data-toggle="button" class="btn btn-xs float-right" aria-label="<?php echo Text::_('JGLOBAL_EXPAND_CATEGORIES'); ?>">
+							data-toggle="collapse" data-toggle="button" class="btn btn-sm float-right" aria-label="<?php echo Text::_('JGLOBAL_EXPAND_CATEGORIES'); ?>">
 							<span class="icon-plus" aria-hidden="true"></span>
 						</a>
 					<?php endif; ?>
diff --git a/libraries/cms/html/actionsdropdown.php b/libraries/cms/html/actionsdropdown.php
index a04c1f3d65ad7..db5c81bd62fc1 100644
--- a/libraries/cms/html/actionsdropdown.php
+++ b/libraries/cms/html/actionsdropdown.php
@@ -37,7 +37,7 @@ public static function render($item = '')
 	{
 		$html = array();
 
-		$html[] = '<button data-toggle="dropdown" class="dropdown-toggle btn btn-xs btn-secondary">';
+		$html[] = '<button data-toggle="dropdown" class="dropdown-toggle btn btn-sm btn-secondary">';
 		$html[] = '<span class="caret"></span>';
 
 		if ($item)
diff --git a/libraries/cms/html/dropdown.php b/libraries/cms/html/dropdown.php
index 7654ad19a3f52..471175e14b53a 100644
--- a/libraries/cms/html/dropdown.php
+++ b/libraries/cms/html/dropdown.php
@@ -96,7 +96,7 @@ public static function start()
 		}
 
 		$dropDownList = '<div class="btn-group" style="margin-left:6px;display:none">
-							<a href="#" data-toggle="dropdown" class="dropdown-toggle btn btn-secondary btn-xs">
+							<a href="#" data-toggle="dropdown" class="dropdown-toggle btn btn-secondary btn-sm">
 								<span class="caret"></span>
 							</a>
 							<ul class="dropdown-menu">';
diff --git a/libraries/cms/html/grid.php b/libraries/cms/html/grid.php
index a824fd418391a..544380c27727f 100644
--- a/libraries/cms/html/grid.php
+++ b/libraries/cms/html/grid.php
@@ -258,7 +258,7 @@ public static function state($filter_state = '*', $published = 'JPUBLISHED', $un
 	public static function order($rows, $image = 'filesave.png', $task = 'saveorder')
 	{
 		return '<a href="javascript:saveorder('
-			. (count($rows) - 1) . ', \'' . $task . '\')" rel="tooltip" class="saveorder btn btn-xs btn-secondary float-right" title="'
+			. (count($rows) - 1) . ', \'' . $task . '\')" rel="tooltip" class="saveorder btn btn-sm btn-secondary float-right" title="'
 			. Text::_('JLIB_HTML_SAVE_ORDER') . '"><span class="icon-menu-2"></span></a>';
 	}
 
diff --git a/templates/cassiopeia/scss/vendor/bootstrap/_buttons.scss b/templates/cassiopeia/scss/vendor/bootstrap/_buttons.scss
index cf16a456bc38b..74fcf5aa0a520 100644
--- a/templates/cassiopeia/scss/vendor/bootstrap/_buttons.scss
+++ b/templates/cassiopeia/scss/vendor/bootstrap/_buttons.scss
@@ -1,18 +1,5 @@
 // Buttons
 
-.btn.btn-xs,
-.btn-group-xs > .btn {
-  padding: .09rem .4rem;
-  font-size: .7rem;
-  line-height: 1.2;
-  border-radius: .2rem;
-}
-
-.btn.btn-xs .caret {
-  font-size: 16px;
-  line-height: 13px;
-}
-
 .btn:focus,
 .btn.focus,
 .btn:active:focus,