Merge "Adding support to delete unrestored icons and widgets" into ub-now-porkchop