Moved drive icons to wip; other stuff.