Fix #215 - Add icon and move swap camera button