Fixed thread bug / Added icons / Cleaned