Implement refresh and fix delete icons