Bug fix and changing icon (plus css)