Unfinished changes

Unfinished changes in order to update the files and port it over to my
mac.
Revive icon fixed

Looked a little awkward before