Reorganise partials, fix icons