diff --git a/public/css/fixes.css b/public/css/fixes.css
index 6145d28..21ef33e 100644
--- a/public/css/fixes.css
+++ b/public/css/fixes.css
@@ -2,6 +2,28 @@ body {
        font-size: 0.85em;
 }
 
+/* Trim our sidebar down to 250px */
+.app-sidebar {
+	width: 250px;
+	min-width: 250px;
+}
+
+.app-header__logo {
+	width: 250px;
+}
+
+.fixed-sidebar:not(.fixed-header) .app-header {
+	margin-left: 250px;
+}
+
+.fixed-sidebar .app-main .app-main__outer {
+	padding-left: 250px;
+}
+
+.font-icon-wrapper i {
+	font-size: 1.2rem;
+}
+
 /* Fixes for data tables */
 /* Fix pagination buttons */
 .dataTables_wrapper .dataTables_paginate .paginate_button {
diff --git a/resources/themes/architect/views/layouts/partials/sidebarmenu.blade.php b/resources/themes/architect/views/layouts/partials/sidebarmenu.blade.php
index f545130..9583d4d 100644
--- a/resources/themes/architect/views/layouts/partials/sidebarmenu.blade.php
+++ b/resources/themes/architect/views/layouts/partials/sidebarmenu.blade.php
@@ -35,16 +35,16 @@
 				<li class="app-sidebar__heading">{{ $server ?? __('Server Name') }}</li>
 				<li>
 					<div class="font-icon-wrapper float-left mr-1 server-icon">
-						<a class="p-0 m-0" href="{{ LaravelLocalization::localizeUrl('info') }}" onclick="return false;" style="display: contents;"><i class="fas fa-fw fa-info pr-1 pl-1"></i></a>
+						<a class="p-0 m-0" href="{{ LaravelLocalization::localizeUrl('info') }}" onclick="return false;" style="display: contents;"><i class="fas fa-fw fa-info"></i></a>
 					</div>
 					{{--
 					<div class="font-icon-wrapper float-left ml-1 mr-1 server-icon">
-						<a class="p-0 m-0" href="{{ LaravelLocalization::localizeUrl('schema') }}" onclick="return false;" style="display: contents;"><i class="fas fa-fw fa-fingerprint pr-1 pl-1"></i></a>
+						<a class="p-0 m-0" href="{{ LaravelLocalization::localizeUrl('schema') }}" onclick="return false;" style="display: contents;"><i class="fas fa-fw fa-fingerprint"></i></a>
 					</div>
 					--}}
 					@env(['local'])
-						<div class="font-icon-wrapper float-right ml-1 mr-1 server-icon">
-							<a class="p-0 m-0" href="{{ LaravelLocalization::localizeUrl('debug') }}" onclick="return false;" style="display: contents;"><i class="fas fa-fw fa-toolbox pr-1 pl-1"></i></a>
+						<div class="font-icon-wrapper float-right ml-1 server-icon">
+							<a class="p-0 m-0" href="{{ LaravelLocalization::localizeUrl('debug') }}" onclick="return false;" style="display: contents;"><i class="fas fa-fw fa-toolbox"></i></a>
 						</div>
 					@endenv
 					<div class="clearfix"></div>