Standardize border_bg colors
Fix crash on tablets due to style inheritance error
All the icons are named 'icon' now