Icon merge and restoration.
Final merging changes. Build successful.