update icons; clean up forms a little bit

rebuild