Rearrange Icon's to places where located in FCAV1 issue #51