diff --git a/src/Umbraco.Web.UI.Client/src/less/components/tree/umb-tree.less b/src/Umbraco.Web.UI.Client/src/less/components/tree/umb-tree.less
index 839e61c5f9..49cba439bd 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/tree/umb-tree.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/tree/umb-tree.less
@@ -156,7 +156,9 @@ body.touch .umb-tree {
 .umb-tree .umb-tree-node-checked > .umb-tree-item__inner > i[class^="icon-"],
 .umb-tree .umb-tree-node-checked > .umb-tree-item__inner > i[class*=" icon-"],
 .umb-tree .umb-tree-node-checked .umb-search-group-item-name > i[class^="icon-"],
-.umb-tree .umb-tree-node-checked .umb-search-group-item-name > i[class*=" icon-"] {
+.umb-tree .umb-tree-node-checked .umb-search-group-item-name > i[class*=" icon-"], 
+.umb-tree .umb-tree-node-checked > i[class^="icon-"],
+.umb-tree .umb-tree-node-checked > i[class*="icon-"] {
     font-family: 'icomoon' !important;
     color: @green !important;
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/sectionpicker/sectionpicker.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/sectionpicker/sectionpicker.html
index 33906dcd75..feb3b9ab53 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/sectionpicker/sectionpicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/sectionpicker/sectionpicker.html
@@ -19,12 +19,12 @@
             <umb-box ng-if="!vm.loading">
                 <umb-box-content>
                     <ul class="umb-tree">
-                        <li ng-repeat="section in vm.sections" class="umb-tree-item" ng-class="{'umb-tree-node-checked': section.selected }">
-                            <div class="umb-tree-item__inner cursor-pointer" ng-click="vm.selectSection(section)" style="padding: 5px 10px;">
-                                <i class="icon umb-tree-icon {{section.icon}}"></i>
-                                <a class="flex-auto" href="" prevent-default>
+                        <li ng-repeat="section in vm.sections" class="umb-tree-item">
+                            <div class="umb-tree-item__inner" style="padding: 5px 10px;">
+                                <button type="button" class="btn-reset text-left flex-auto" ng-click="vm.selectSection(section)" ng-class="{'umb-tree-node-checked': section.selected }">
+                                    <i class="icon umb-tree-icon {{section.icon}}" aria-hidden="true"></i>
                                     <span>{{ section.name }}</span>
-                                </a>
+                                </button>
                             </div>
                         </li>
                     </ul>