diff --git a/gui/app/components/folder/category-admin.js b/gui/app/components/folder/category-admin.js
index b9f971a7..961e78c9 100644
--- a/gui/app/components/folder/category-admin.js
+++ b/gui/app/components/folder/category-admin.js
@@ -130,11 +130,13 @@ export default Component.extend(NotifierMixin, TooltipMixin, DropdownMixin, {
 
 		onEdit(id) {
 			this.setEdit(id, true);
+			this.removeTooltips();
 		},
 
 		onEditCancel(id) {
 			this.setEdit(id, false);
 			this.load();
+			this.renderTooltips();
 		},
 
 		onSave(id) {
@@ -150,6 +152,8 @@ export default Component.extend(NotifierMixin, TooltipMixin, DropdownMixin, {
 			this.get('categoryService').save(cat).then(() => {
 				this.load();
 			});
+
+			this.renderTooltips();
 		},
 
 		onShowAccessPicker(catId) {
diff --git a/gui/app/styles/view/space.scss b/gui/app/styles/view/space.scss
index f88bc58e..f6ad1c69 100644
--- a/gui/app/styles/view/space.scss
+++ b/gui/app/styles/view/space.scss
@@ -167,7 +167,7 @@
 		> .item {
 			margin: 15px 0;
 			padding: 15px;
-			@include card-theme();
+			@include card();
 			@include ease-in();
 
 			> .category {
diff --git a/gui/app/styles/widget/widget-button.scss b/gui/app/styles/widget/widget-button.scss
index 6e4cc462..50004f64 100644
--- a/gui/app/styles/widget/widget-button.scss
+++ b/gui/app/styles/widget/widget-button.scss
@@ -470,6 +470,41 @@
 	}
 }
 
+.button-icon-theme {
+	display: inline-block;
+	cursor: default;
+	@include ease-in();
+
+	> i {
+		color: $color-primary;
+		font-size: 2rem;
+		@include ease-in();
+	}
+
+	&:hover {
+		> i {
+			color: darken($color-primary, 5%);
+		}
+	}
+}
+
+.button-icon-theme-light {
+	display: inline-block;
+	cursor: default;
+	@include ease-in();
+
+	> i {
+		color: $color-primary-light;
+		font-size: 2rem;
+		@include ease-in();
+	}
+
+	&:hover {
+		> i {
+			color: darken($color-primary-light, 5%);
+		}
+	}
+}
 .button-icon-small {
 	> i {
 		font-size: 1.3rem;
diff --git a/gui/app/templates/components/folder/category-admin.hbs b/gui/app/templates/components/folder/category-admin.hbs
index 529c3407..f9e4e83d 100644
--- a/gui/app/templates/components/folder/category-admin.hbs
+++ b/gui/app/templates/components/folder/category-admin.hbs
@@ -42,14 +42,14 @@
 									<i class="material-icons">edit</i>
 								</div>
 								<div class="button-icon-gap" />
-								<div id="{{concat 'delete-category-' cat.id}}" class="button-icon-gray align-middle" data-toggle="tooltip" data-placement="top" title="Delete" {{action 'onShowDelete' cat.id}}>
+								<div id="{{concat 'delete-category-' cat.id}}" class="button-icon-red align-middle" data-toggle="tooltip" data-placement="top" title="Delete" {{action 'onShowDelete' cat.id}}>
 									<i class="material-icons">delete</i>
 								</div>
 							{{/if}}
 						</div>
 					</div>
 				{{else}}
-					<div class="margin-top-30"><i>No categories defined yet</i></div>
+					<div class="margin-top-30"><i>No categories</i></div>
 				{{/each}}
 			</div>
 		</div>