diff --git a/core/modules/filter/css/filter.caption.css b/core/modules/filter/css/filter.caption.css
index c436f1b..1b25ffd 100644
--- a/core/modules/filter/css/filter.caption.css
+++ b/core/modules/filter/css/filter.caption.css
@@ -7,16 +7,15 @@
  * Essentials, based on http://stackoverflow.com/a/13363408.
  */
 .caption {
-  display: table;
+  display: block;
 }
 .caption > * {
   display: block;
   max-width: 100%;
 }
 .caption > figcaption {
-  display: table-caption;
+  display: block;
   caption-side: bottom;
-  max-width: none;
 }
 
 /**
diff --git a/core/themes/bartik/css/components/captions.css b/core/themes/bartik/css/components/captions.css
index cd24809..7c59351 100644
--- a/core/themes/bartik/css/components/captions.css
+++ b/core/themes/bartik/css/components/captions.css
@@ -7,8 +7,11 @@
   padding: 0.5ex;
   border: 1px solid #CCC;
 }
+.caption > img {
+  padding-bottom: 0.5ex;
+  box-sizing: border-box;
+}
 .caption > figcaption {
-  border: 1px solid #CCC;
   border-top: none;
   padding-top: 0.5ex;
   font-size: small;