Added a filter to account for AWS and updated icons.