User Settings and Icon Update

Not much else