Updated icons & cleaned up brackets