diff --git a/public/less/admin/admin.less b/public/less/admin/admin.less
index 61462cef49..6d4dce3e43 100644
--- a/public/less/admin/admin.less
+++ b/public/less/admin/admin.less
@@ -308,6 +308,7 @@
 }
 
 .category-preview {
+	.pointer;
 	width: 100%;
 	height: 100px;
 	text-align: center;
diff --git a/public/src/admin/manage/category.js b/public/src/admin/manage/category.js
index 81db954432..e969b6e6d2 100644
--- a/public/src/admin/manage/category.js
+++ b/public/src/admin/manage/category.js
@@ -3,7 +3,7 @@
 
 define('admin/manage/category', [
 	'uploader',
-	'admin/modules/iconSelect',
+	'iconSelect',
 	'admin/modules/colorpicker',
 	'autocomplete'
 ], function(uploader, iconSelect, colorpicker, autocomplete) {
diff --git a/public/src/modules/iconSelect.js b/public/src/modules/iconSelect.js
index 6871948a6e..5dea30c189 100644
--- a/public/src/modules/iconSelect.js
+++ b/public/src/modules/iconSelect.js
@@ -19,29 +19,38 @@ define('iconSelect', function() {
 			$('#icons .fa-icons .fa.' + selected).addClass('selected');
 		}
 
-		bootbox.confirm('<h2>Select an icon.</h2>' + $('#icons').html(), function(confirm) {
-			if (confirm) {
-				var iconClass = $('.bootbox .selected').attr('class');
-				var categoryIconClass = $('<div/>').addClass(iconClass).removeClass('fa').removeClass('selected').attr('class');
-				if (categoryIconClass === 'fa-doesnt-exist') {
-					categoryIconClass = '';
-				}
+		templates.parse('partials/fontawesome', {}, function(html) {
+			var picker = bootbox.dialog({
+					message: html,
+					title: 'Select an Icon',
+					buttons: {
+						success: {
+							label: 'Save',
+							callback: function(confirm) {
+								var iconClass = $('.bootbox .selected').attr('class');
+								var categoryIconClass = $('<div/>').addClass(iconClass).removeClass('fa').removeClass('selected').attr('class');
+								if (categoryIconClass === 'fa-doesnt-exist') {
+									categoryIconClass = '';
+								}
 
-				el.attr('class', 'fa ' + (doubleSize ? 'fa-2x ' : '') + categoryIconClass);
-				el.val(categoryIconClass);
-				el.attr('value', categoryIconClass);
+								el.attr('class', 'fa ' + (doubleSize ? 'fa-2x ' : '') + categoryIconClass);
+								el.val(categoryIconClass);
+								el.attr('value', categoryIconClass);
 
-				console.log(el);
-				onModified(el);
-			}
-		});
+								onModified(el);
+							}
+						}
+					}
+				});
 
-		setTimeout(function() {
-			$('.bootbox .fa-icons i').on('click', function() {
-				$('.bootbox .selected').removeClass('selected');
-				$(this).addClass('selected');
+			picker.on('shown.bs.modal', function() {
+				var modalEl = $(this);
+				modalEl.find('.icon-container').on('click', 'i', function() {
+					modalEl.find('.icon-container i').removeClass('selected');
+					$(this).addClass('selected');
+				});
 			});
-		}, 500);
+		});
 	};
 
 	return iconSelect;
diff --git a/src/views/admin/manage/category.tpl b/src/views/admin/manage/category.tpl
index 4b3b01c66f..3b5cd4df0c 100644
--- a/src/views/admin/manage/category.tpl
+++ b/src/views/admin/manage/category.tpl
@@ -133,6 +133,10 @@
 					</div>
 					<hr />
 					<button class="btn btn-danger btn-block btn-xs purge"><i class="fa fa-eraser"></i> Purge Category</button>
+					<p class="help-block">
+						Purging a category will remove all topics and posts, and delete the category from the database. If you want to
+						remove a category <em>temporarily</em>, you'll want to "disable" the category instead.
+					</p>
 				</div>
 			</div>
 		</div>