diff --git a/CHANGELOG b/CHANGELOG
index e505261..80f4837 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,7 +1,7 @@
-0.3.3 (11-10-2017)
+0.3.3 (12-10-2017)
 =========================
 - Fixed database reloading when KeePassXC has restarted and database is opened
-- New buttons
+- New buttons with glyphicons
 
 0.3.2 (30-09-2017)
 =========================
diff --git a/keepassxc-browser/options/options.html b/keepassxc-browser/options/options.html
index 97cc858..9da6052 100644
--- a/keepassxc-browser/options/options.html
+++ b/keepassxc-browser/options/options.html
@@ -40,7 +40,7 @@
 						<div class="control-group">
 							<div class="input-append">
 								<input type="number" id="blinkTimeout" placeholder="7500" value="7500" />
-								<button class="btn btn-sm" id="blinkTimeoutButton" type="button">Save</button>
+								<button class="btn btn-sm btn-primary" id="blinkTimeoutButton" type="button"><span class="glyphicon glyphicon-floppy-disk"></span> Save</button>
 							</div>
 						</div>
 						<span class="help-inline">
@@ -56,7 +56,7 @@
 						<div class="control-group">
 							<div class="input-append">
 								<input type="number" id="blinkMinTimeout" placeholder="2000" value="2000" />
-								<button class="btn btn-sm" id="blinkMinTimeoutButton" type="button">Save</button>
+								<button class="btn btn-sm btn-primary" id="blinkMinTimeoutButton" type="button"><span class="glyphicon glyphicon-floppy-disk"></span> Save</button>
 							</div>
 						</div>
 						<span class="help-inline">
@@ -74,7 +74,7 @@
 						<div class="control-group">
 							<div class="input-append">
 								<input type="number" id="allowedRedirect" placeholder="1" value="1" />
-								<button class="btn btn-sm" id="allowedRedirectButton" type="button">Save</button>
+								<button class="btn btn-sm btn-primary" id="allowedRedirectButton" type="button"><span class="glyphicon glyphicon-floppy-disk"></span> Save</button>
 							</div>
 						</div>
 						<span class="help-inline">
@@ -90,7 +90,7 @@
 						<div class="control-group">
 							<div class="input-append">
 								<input type="number" id="port" placeholder="19700" value="19700" />
-								<button class="btn btn-sm" id="portButton" type="button">Save</button>
+								<button class="btn btn-sm btn-primary" id="portButton" type="button"><span class="glyphicon glyphicon-floppy-disk"></span> Save</button>
 							</div>
 							<span class="help-inline">
 								Change the port if you have trouble with running KeePassXC on the default port.
@@ -160,7 +160,7 @@
 					</div>
 					<div>
 						Latest available version of KeePassXC: <em class="latestVersion"></em>
-						<button class="btn btn-sm checkUpdateKeePassXC">Check for updates</button>
+						<button class="btn btn-sm btn-primary checkUpdateKeePassXC"><span class="glyphicon glyphicon-refresh"></span> Check for updates</button>
 					</div>
 				</div>
 				<hr />
@@ -257,7 +257,7 @@
 						</tr>
 						<tr class="clone">
 							<td></td>
-							<td><button class="btn delete btn-danger btn">Remove</button></td>
+							<td><button class="btn delete btn-danger btn"><span class="glyphicon glyphicon-remove-sign"></span> Remove</button></td>
 						</tr>
 					</tbody>
 				</table>
diff --git a/keepassxc-browser/popups/popup.css b/keepassxc-browser/popups/popup.css
index 4af7192..9eabf3b 100644
--- a/keepassxc-browser/popups/popup.css
+++ b/keepassxc-browser/popups/popup.css
@@ -35,6 +35,8 @@ body {
 }
 
 .settings {
+	padding-bottom: 10px;
+	margin-bottom: 10px;
 	border-bottom: 1px solid #333;
 	font-size: 90%;
 	text-align: left;
@@ -59,6 +61,8 @@ body {
 #update-available {
 	padding-top: 10px;
 	margin-top: 10px;
+	padding-bottom: 0px;
+	margin-bottom: 0px;
 	text-align: left;
 }
 #update-available a:hover,