Code and some small  icon fixes for things

Code and some small  icon fixes for things