Updated color picker icon, cleaned up some code

1.2.1