Really fix icon sizes
More efficient set restriction
Disabling a restriction category will delete exceptions

Closes #1198
Several speed optimizations
Explicitly delete category restriction