Fixed #133 and adde new icons