Moved colorpicker to regular package
Changed design of color picker and of circle button.