Fix some block activation stuff, remove unused icons.