Some more model icon organization