Bug fixes

Fixed a few bugs and changed dialog icons