diff --git a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treepicker.html b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treepicker.html
index ab1b84db97..2fb2aab352 100644
--- a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treepicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treepicker.html
@@ -15,12 +15,11 @@
 		</umb-node-preview>
 	</div>
 
-	<a ng-show="model.config.multiPicker === true || renderModel.length === 0"
-		class="umb-node-preview-add"
-		href=""
-		ng-click="openContentPicker()"
-		prevent-default>
+	<button type="button"
+		    class="umb-node-preview-add"
+            ng-show="model.config.multiPicker === true || renderModel.length === 0"
+		    ng-click="openContentPicker()">
 		<localize key="general_add">Add</localize>
-	</a>
+	</button>
 
 </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treesource.html b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treesource.html
index e693801495..865b59506b 100644
--- a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treesource.html
+++ b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treesource.html
@@ -6,7 +6,6 @@
 		<option value="member">Members</option>
 	</select>
 
-
     <umb-node-preview
 		ng-show="node"
         class="mt1"
@@ -21,40 +20,36 @@
 	</umb-node-preview>
 
     <div ng-if="!node && model.value.type !== 'member'" class="mt2">
-        <span ng-hide="showSearch || model.value.query">
-            <a class="umb-node-preview-add"
-               href=""
-               ng-click="openContentPicker()"
-               prevent-default>
+        <div ng-hide="showSearch || model.value.query">
+            <button type="button" class="umb-node-preview-add"
+                    ng-click="openContentPicker()">
                 <localize key="general_choose">Choose a root node</localize>
-            </a>
+            </button>
             <div class="mt2" ng-show="model.value.type == 'content'">
-                <i class="icon icon-search"></i>
-                <a href ng-click="showSearch = true">Query for root node with xpath</a>
+                <i class="icon icon-search" aria-hidden="true"></i>
+                <button type="button" class="btn-link" ng-click="showSearch = true">Query for root node with xpath</button>
             </div>
-        </span>
+        </div>
 
-        <span ng-show="showSearch || model.value.query">
+        <div ng-show="showSearch || model.value.query">
 
             <input type="text"
                    ng-model="model.value.query"
                    class="umb-property-editor umb-textstring"
                    placeholder="Enter xpath query">
 
-            <ul class="unstyled list-icons" style="margin-top: 15px">
+            <ul class="unstyled list-icons mt3">
                 <li style="max-width: 600px">
-                    <i class="icon icon-help-alt"></i>
-                    <a href ng-click="showHelp = 1" prevent-default>
-                        Show xpath query help
-                    </a>
+                    <i class="icon icon-help-alt" aria-hidden="true"></i>
+                    <button type="button" class="btn-link" ng-click="showHelp = 1">Show xpath query help</button>
 
-                    <small ng-if="showHelp">
+                    <div class="small" ng-if="showHelp">
                         <p>
                             Use Xpath query to set a root node on the tree, either based on a search from the root of the content tree, or by using a context-aware placeholder.
                         </p>
 
                         <p>
-                            Placeholders finds the nearest published ID and runs its query from there. so for instance:
+                            Placeholders finds the nearest published ID and runs its query from there, so for instance:
 
                             <pre>$parent/newsArticle</pre>
 
@@ -68,14 +63,14 @@
                             <code>$root</code>: root of the content tree<br/>
                             <code>$site</code>: Ancestor node at level 1 <br/>
                         </p>
-                    </small>
+                    </div>
                 </li>
                 <li>
-                    <i class="icon icon-delete red"></i>
-                    <a href ng-click="showSearch = false; model.value.query = ''"> Cancel and clear query</a>
+                    <i class="icon icon-delete red" aria-hidden="true"></i>
+                    <button type="button" class="btn-link" ng-click="showSearch = false; model.value.query = ''"> Cancel and clear query</button>
                 </li>
             </ul>
-        </span>
+        </div>
     </div>
 
 </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treesourcetypepicker.html b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treesourcetypepicker.html
index f679b53093..cdbacfc7f3 100644
--- a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treesourcetypepicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treesourcetypepicker.html
@@ -12,12 +12,11 @@
                           on-remove="vm.remove(itemType)">
         </umb-node-preview>
 
-        <a class="umb-node-preview-add"
-           href=""
-           ng-click="vm.add()"
-           prevent-default>
+        <button type="button"
+                class="umb-node-preview-add"
+                ng-click="vm.add()">
             <localize key="general_add">Add</localize>
-        </a>
+        </button>
     </div>
 
 </div>