diff --git a/src/views/admin/appearance/skins.tpl b/src/views/admin/appearance/skins.tpl
index e30bace825..34f72a2068 100644
--- a/src/views/admin/appearance/skins.tpl
+++ b/src/views/admin/appearance/skins.tpl
@@ -1,7 +1,7 @@
 <!-- IMPORT admin/appearance/header.tpl -->
 
 <div id="skins" class="row">
-	<div class="col-md-9">
+	<div class="col-lg-9">
 		<div class="panel panel-default">
 			<div class="panel-heading">Bootswatch Themes</div>
 			<div class="panel-body">
@@ -14,7 +14,7 @@
 			</div>
 		</div>
 	</div>
-	<div class="col-md-3">
+	<div class="col-lg-3">
 		<div class="panel panel-default">
 			<div class="panel-heading">Revert to Default</div>
 			<div class="panel-body">
diff --git a/src/views/admin/settings/advanced.tpl b/src/views/admin/settings/advanced.tpl
index 26ee0700d4..b7b288d458 100644
--- a/src/views/admin/settings/advanced.tpl
+++ b/src/views/admin/settings/advanced.tpl
@@ -1,3 +1,5 @@
+<!-- IMPORT admin/settings/header.tpl -->
+
 <div class="panel panel-default">
 	<div class="panel-heading">Maintenance Mode</div>
 	<div class="panel-body">
diff --git a/src/views/admin/settings/email.tpl b/src/views/admin/settings/email.tpl
index 904f4176c9..0196288beb 100644
--- a/src/views/admin/settings/email.tpl
+++ b/src/views/admin/settings/email.tpl
@@ -1,3 +1,5 @@
+<!-- IMPORT admin/settings/header.tpl -->
+
 <div class="panel panel-default">
 	<div class="panel-heading">Email Settings</div>
 	<div class="panel-body">
diff --git a/src/views/admin/settings/footer.tpl b/src/views/admin/settings/footer.tpl
index 60fcd5523c..5251b3b124 100644
--- a/src/views/admin/settings/footer.tpl
+++ b/src/views/admin/settings/footer.tpl
@@ -1,6 +1,15 @@
-
+</div>
 <span class="hidden" id="csrf" data-csrf="{csrf}"></span>
-<button class="btn btn-primary" id="save">Save</button>
+
+<div class="col-lg-3">
+	<div class="panel panel-default">
+		<div class="panel-heading">Save Settings</div>
+		<div class="panel-body">
+			<button class="btn btn-primary btn-md" id="save">Save Changes</button>
+			<button class="btn btn-warning btn-md" id="revert">Revert Changes</button>
+		</div>
+	</div>
+</div>
 
 <script>
 	require(['forum/admin/settings'], function(Settings) {
diff --git a/src/views/admin/settings/general.tpl b/src/views/admin/settings/general.tpl
index 573cef89b9..1f67811f3f 100644
--- a/src/views/admin/settings/general.tpl
+++ b/src/views/admin/settings/general.tpl
@@ -1,3 +1,5 @@
+<!-- IMPORT admin/settings/header.tpl -->
+
 <div class="panel panel-default">
 	<div class="panel-heading">Site Settings</div>
 	<div class="panel-body">
diff --git a/src/views/admin/settings/header.tpl b/src/views/admin/settings/header.tpl
new file mode 100644
index 0000000000..df305643d9
--- /dev/null
+++ b/src/views/admin/settings/header.tpl
@@ -0,0 +1 @@
+<div class="col-lg-9">
\ No newline at end of file
diff --git a/src/views/admin/settings/pagination.tpl b/src/views/admin/settings/pagination.tpl
index e30f49e4d4..545c18c680 100644
--- a/src/views/admin/settings/pagination.tpl
+++ b/src/views/admin/settings/pagination.tpl
@@ -1,3 +1,5 @@
+<!-- IMPORT admin/settings/header.tpl -->
+
 <div class="panel panel-default">
 	<div class="panel-heading">Pagination Settings</div>
 	<div class="panel-body">
diff --git a/src/views/admin/settings/post.tpl b/src/views/admin/settings/post.tpl
index f8fc856865..b618e6f5ba 100644
--- a/src/views/admin/settings/post.tpl
+++ b/src/views/admin/settings/post.tpl
@@ -1,3 +1,5 @@
+<!-- IMPORT admin/settings/header.tpl -->
+
 <div class="panel panel-default">
 	<div class="panel-heading">Post Settings</div>
 	<div class="panel-body">
diff --git a/src/views/admin/settings/reputation.tpl b/src/views/admin/settings/reputation.tpl
index 704a93fef1..ae0a6b706e 100644
--- a/src/views/admin/settings/reputation.tpl
+++ b/src/views/admin/settings/reputation.tpl
@@ -1,3 +1,5 @@
+<!-- IMPORT admin/settings/header.tpl -->
+
 <div class="panel panel-default">
 	<div class="panel-heading">Reputation Settings</div>
 	<div class="panel-body">
diff --git a/src/views/admin/settings/sockets.tpl b/src/views/admin/settings/sockets.tpl
index 30ba644b45..ffbb7d7ad1 100644
--- a/src/views/admin/settings/sockets.tpl
+++ b/src/views/admin/settings/sockets.tpl
@@ -1,3 +1,5 @@
+<!-- IMPORT admin/settings/header.tpl -->
+
 <div class="panel panel-default">
 	<div class="panel-heading">Web Socket Settings</div>
 	<div class="panel-body">
diff --git a/src/views/admin/settings/tags.tpl b/src/views/admin/settings/tags.tpl
index 05e794677b..fd941d7c82 100644
--- a/src/views/admin/settings/tags.tpl
+++ b/src/views/admin/settings/tags.tpl
@@ -1,3 +1,5 @@
+<!-- IMPORT admin/settings/header.tpl -->
+
 <div class="panel panel-default">
 	<div class="panel-heading">Tag Settings</div>
 	<div class="panel-body">
diff --git a/src/views/admin/settings/user.tpl b/src/views/admin/settings/user.tpl
index 9d99b64300..2cf10687b3 100644
--- a/src/views/admin/settings/user.tpl
+++ b/src/views/admin/settings/user.tpl
@@ -1,3 +1,5 @@
+<!-- IMPORT admin/settings/header.tpl -->
+
 <div class="panel panel-default">
 	<div class="panel-heading">User Settings</div>
 	<div class="panel-body">
diff --git a/src/views/admin/settings/web-crawler.tpl b/src/views/admin/settings/web-crawler.tpl
index 20d66fb2e5..f7d57ec241 100644
--- a/src/views/admin/settings/web-crawler.tpl
+++ b/src/views/admin/settings/web-crawler.tpl
@@ -1,3 +1,5 @@
+<!-- IMPORT admin/settings/header.tpl -->
+
 <div class="panel panel-default">
 	<div class="panel-heading">Crawlability Settings</div>
 	<div class="panel-body">