Cleaned up icon order