Improve code for paging, add better rounded icons