diff --git a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/imagepicker.html b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/imagepicker.html
index d797501d91..9f65035c23 100644
--- a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/imagepicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/imagepicker.html
@@ -5,18 +5,19 @@
             <img ng-src="{{model.value}}" alt="">
 
             <div class="umb-sortable-thumbnails__actions">
-                <!--<a class="umb-sortable-thumbnails__action" href="" ng-click="goToItem(image)">
-                    <i class="icon icon-edit"></i>
-                </a>-->
-                <a class="umb-sortable-thumbnails__action -red" href="" ng-click="remove()">
-                    <i class="icon icon-delete"></i>
-                </a>
+                <button type="button" aria-label="Remove" class="umb-sortable-thumbnails__action -red btn-reset" ng-click="remove()">
+                    <i class="icon icon-delete" aria-hidden="true"></i>
+                </button>
             </div>
         </li>
     </ul>
 
-    <a href="#" class="add-link umb-outline umb-outline--surrounding" ng-click="add()" ng-class="{'add-link-square': !model.value }" ng-hide="model.value" prevent-default>
-        <i class="icon icon-add large"></i>
-    </a>
+    <button type="button"
+            class="add-link umb-outline umb-outline--surrounding"
+            ng-class="{'add-link-square': !model.value }"
+            ng-click="add()"
+            ng-hide="model.value">
+        <i class="icon icon-add large" aria-hidden="true"></i>
+    </button>
 
 </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/mediapicker.html b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/mediapicker.html
index 03bcad9289..c00c5585f2 100644
--- a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/mediapicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/mediapicker.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="openTreePicker()"
-		prevent-default>
+	<button type="button"
+            class="umb-node-preview-add"
+            ng-show="model.config.multiPicker === true || renderModel.length === 0"
+            ng-click="openTreePicker()">
 		<localize key="general_add">Add</localize>
-	</a>
+	</button>
 
 </div>