Adapting table to new theme
Work on toolbar adaptation