Better detection of current tab + added a bigger icon