Fix workspace renaming; fix layout icon cleanup.

If an invalid workspace is specified, the workspace does no longer get
renamed, but it keeps its old value.

Layout icon pixmaps are now correctly free'd in the cleanup().