Finished icons implementation