Moar bug fixes.
MOAR BUG FIXESSS.
Update icons.
Update icons.
Resolve git conflicts.