Update

Added icons; confirmed generic functionality