diff --git a/core/wiki/macros/thumbnails.tid b/core/wiki/macros/thumbnails.tid
index af5afbe32..36a9e5fbd 100644
--- a/core/wiki/macros/thumbnails.tid
+++ b/core/wiki/macros/thumbnails.tid
@@ -2,32 +2,20 @@ title: $:/core/macros/thumbails
 tags: $:/tags/Macro
 
 \define thumbnail(link,icon,color,background-color,image,caption,width:"280",height:"157")
-<$link to="""$link$""">
-<div class="tc-thumbnail-wrapper">
-<div class="tc-thumbnail-image" style="width:$width$px;height:$height$px;">
-<$reveal type="nomatch" text="" default="""$image$""" tag="div" style="width:$width$px;height:$height$px;">
+<$link to="""$link$"""><div class="tc-thumbnail-wrapper">
+<div class="tc-thumbnail-image" style="width:$width$px;height:$height$px;"><$reveal type="nomatch" text="" default="""$image$""" tag="div" style="width:$width$px;height:$height$px;">
 [img[$image$]]
-</$reveal>
-<$reveal type="match" text="" default="""$image$""" tag="div" class="tc-thumbnail-background" style="width:$width$px;height:$height$px;background-color:$background-color$;">
-</$reveal>
-</div>
-<div class="tc-thumbnail-icon" style="fill:$color$;">
+</$reveal><$reveal type="match" text="" default="""$image$""" tag="div" class="tc-thumbnail-background" style="width:$width$px;height:$height$px;background-color:$background-color$;"></$reveal></div><div class="tc-thumbnail-icon" style="fill:$color$;">
 $icon$
-</div>
-<div class="tc-thumbnail-caption">
+</div><div class="tc-thumbnail-caption">
 $caption$
-</div>
-</div></$link>
+</div></div></$link>
 \end
 
 \define thumbnail-right(link,icon,color,background-color,image,caption,width:"280",height:"157")
-<div class="tc-thumbnail-right-wrapper">
-<<thumbnail """$link$""" """$icon$""" """$color$""" """$background-color$""" """$image$""" """$caption$""" """$width$""" """$height$""">>
-</div>
+<div class="tc-thumbnail-right-wrapper"><<thumbnail """$link$""" """$icon$""" """$color$""" """$background-color$""" """$image$""" """$caption$""" """$width$""" """$height$""">></div>
 \end
 
 \define list-thumbnails(filter,width:"280",height:"157")
-<$list filter="""$filter$""">
-<$macrocall $name="thumbnail" link={{!!link}} icon={{!!icon}} color={{!!color}} background-color={{!!background-color}} image={{!!image}} caption={{!!caption}} width="""$width$""" height="""$height$"""/>
-</$list>
+<$list filter="""$filter$"""><$macrocall $name="thumbnail" link={{!!link}} icon={{!!icon}} color={{!!color}} background-color={{!!background-color}} image={{!!image}} caption={{!!caption}} width="""$width$""" height="""$height$"""/></$list>
 \end
diff --git a/themes/tiddlywiki/vanilla/base.tid b/themes/tiddlywiki/vanilla/base.tid
index dc701ff86..41392ac2b 100644
--- a/themes/tiddlywiki/vanilla/base.tid
+++ b/themes/tiddlywiki/vanilla/base.tid
@@ -1656,15 +1656,13 @@ body.tc-dirty span.tc-dirty-indicator, body.tc-dirty span.tc-dirty-indicator svg
 }
 
 /*
-** YouTube macros
+** Thumbnail macros
 */
 
 .tc-thumbnail-wrapper {
 	position: relative;
 	display: inline-block;
-	border: 1px solid <<colour muted-foreground>>;
-	border-radius: 3px;
-	margin: 2px;
+	margin: 0;
 	vertical-align: top;
 }
 
@@ -1694,7 +1692,6 @@ body.tc-dirty span.tc-dirty-indicator, body.tc-dirty span.tc-dirty-indicator svg
 
 .tc-thumbnail-background {
 	position: absolute;
-	border-radius: 2px;
 }
 
 .tc-thumbnail-icon svg,
@@ -1727,8 +1724,6 @@ body.tc-dirty span.tc-dirty-indicator, body.tc-dirty span.tc-dirty-indicator svg
 	width: 100%;
 	filter: alpha(opacity=0.9);
 	opacity: 0.9;
-	border-bottom-left-radius: 2px;
-	border-bottom-right-radius: 2px;
 	line-height: 1.4;
 }