Clean up settings and redo lost icons