diff --git a/src/content/badges_and_labels.html b/src/content/badges_and_labels.html
index a2e77b9139..c2bf60f60d 100644
--- a/src/content/badges_and_labels.html
+++ b/src/content/badges_and_labels.html
@@ -76,28 +76,28 @@ <h3>Badge with Links</h3>
 
 		<div>
 			<span class="badge badge-primary badge-sm">
-				Small Badge
-				<a class="badge-link" href="#1">
+				<a href="#1">Small Badge</a>
+				<button aria-label="Close" class="close" type="button">
 					<svg aria-hidden="true" class="lexicon-icon lexicon-icon-times">
 						<use xlink:href="../../images/icons/icons.svg#times"></use>
 					</svg>
-				</a>
+				</button>
 			</span>
 			<span class="badge badge-secondary">
-				Normal Badge
-				<a class="badge-link" href="#1">
+				<a href="#1">Normal Badge</a>
+				<button aria-label="Close" class="close" type="button">
 					<svg aria-hidden="true" class="lexicon-icon lexicon-icon-times">
 						<use xlink:href="../../images/icons/icons.svg#times"></use>
 					</svg>
-				</a>
+				</button>
 			</span>
 			<span class="badge badge-lg badge-success">
-				Large Badge
-				<a class="badge-link" href="#1">
+				<a href="#1">Large Badge</a>
+				<button aria-label="Close" class="close" type="button">
 					<svg aria-hidden="true" class="lexicon-icon lexicon-icon-times">
 						<use xlink:href="../../images/icons/icons.svg#times"></use>
 					</svg>
-				</a>
+				</button>
 			</span>
 		</div>
 	</div>
@@ -175,28 +175,28 @@ <h3>Label with Links</h3>
 
 		<div>
 			<span class="label label-primary label-sm">
-				Small Label
-				<a href="#1">
+				<a href="#1">Small Label</a>
+				<button aria-label="Close" class="close" type="button">
 					<svg aria-hidden="true" class="lexicon-icon lexicon-icon-times">
 						<use xlink:href="../../images/icons/icons.svg#times"></use>
 					</svg>
-				</a>
+				</button>
 			</span>
 			<span class="label label-secondary">
-				Normal Label
-				<a href="#1">
+				<a href="#1">Normal Label</a>
+				<button aria-label="Close" class="close" type="button">
 					<svg aria-hidden="true" class="lexicon-icon lexicon-icon-times">
 						<use xlink:href="../../images/icons/icons.svg#times"></use>
 					</svg>
-				</a>
+				</button>
 			</span>
 			<span class="label label-lg label-success">
-				Large Label
-				<a href="#1">
+				<a href="#1">Large Label</a>
+				<button aria-label="Close" class="close" type="button">
 					<svg aria-hidden="true" class="lexicon-icon lexicon-icon-times">
 						<use xlink:href="../../images/icons/icons.svg#times"></use>
 					</svg>
-				</a>
+				</button>
 			</span>
 		</div>
 	</div>