Changed icon strategy. Updated table style.