Fixes, cleanup and translation

The Icons are missing in your commit. Those are fontawesome 4.1.0 icons