change order or icons again
cleanup
Merge branch 'rewrite-rails' of github.com:XanderStrike/movie-browser into rewrite-rails
cleanup