diff --git a/core/modules/system/css/components/item-list.theme.css b/core/modules/system/css/components/item-list.theme.css
index d494bf0..1623907 100644
--- a/core/modules/system/css/components/item-list.theme.css
+++ b/core/modules/system/css/components/item-list.theme.css
@@ -2,21 +2,6 @@
  * @file
  * Visual styles for item list.
  */
-
-.item-list .title {
-  font-weight: bold;
-}
-.item-list ul {
-  margin: 0 0 0.75em 0;
-  padding: 0;
-}
-.item-list ul li {
-  margin: 0 0 0.25em 1.5em; /* LTR */
-  padding: 0;
-}
-[dir="rtl"] .item-list ul li {
-  margin: 0 1.5em 0.25em 0;
-}
 ul.item-list__comma-list,
 .item-list ul.item-list__comma-list {
   display: inline;
@@ -28,12 +13,8 @@ ul.item-list__comma-list li,
 }
 ul.item-list__comma-list,
 ul.item-list__comma-list li,
-.item-list .item-list__comma-list,
-.item-list .item-list__comma-list li,
 [dir="rtl"] ul.item-list__comma-list,
-[dir="rtl"] ul.item-list__comma-list li
-[dir="rtl"] .item-list .item-list__comma-list,
-[dir="rtl"] .item-list .item-list__comma-list li {
+[dir="rtl"] ul.item-list__comma-list li {
   margin: 0;
   padding: 0;
 }
diff --git a/core/themes/classy/css/dataset/item.list.css b/core/themes/classy/css/dataset/item.list.css
index b0730d3..bce0456 100644
--- a/core/themes/classy/css/dataset/item.list.css
+++ b/core/themes/classy/css/dataset/item.list.css
@@ -2,6 +2,37 @@
  * @file
  * Styling for item lists.
  */
+.item-list .title {
+  font-weight: bold;
+}
+.item-list ul {
+  margin: 0 0 0.75em 0;
+  padding: 0;
+}
+.item-list ul li {
+  margin: 0 0 0.25em 1.5em; /* LTR */
+  padding: 0;
+}
+[dir="rtl"] .item-list ul li {
+  margin: 0 1.5em 0.25em 0;
+}
 div.item-list__comma-list {
   display: inline;
 }
+/**
+ * Comma separated lists inside lists.
+ */
+.item-list ul.item-list__comma-list {
+  display: inline;
+}
+.item-list ul.item-list__comma-list li {
+  display: inline;
+  list-style-type: none;
+}
+.item-list .item-list__comma-list,
+.item-list .item-list__comma-list li,
+[dir="rtl"] .item-list .item-list__comma-list,
+[dir="rtl"] .item-list .item-list__comma-list li {
+  margin: 0;
+  padding: 0;
+}
diff --git a/core/themes/classy/templates/dataset/item-list.html.twig b/core/themes/classy/templates/dataset/item-list.html.twig
index 8aa7ba9..abecd47 100644
--- a/core/themes/classy/templates/dataset/item-list.html.twig
+++ b/core/themes/classy/templates/dataset/item-list.html.twig
@@ -18,11 +18,14 @@
  * @see template_preprocess_item_list()
  */
 #}
-{% if context.list_style %}
-  {% set attributes = attributes.addClass('item-list__' ~ context.list_style) %}
-{% endif %}
+{%- if context.list_style -%}
+  {%- set attributes = attributes.addClass('item-list__' ~ context.list_style) -%}
+  {%- set wrapper_class = 'item-list item-list__' ~ context.list_style -%}
+{%- else -%}
+  {%- set wrapper_class = 'item-list' -%}
+{%- endif -%}
 {%- if items or empty -%}
-  <div class="item-list {{ 'item-list__' ~ context.list_style }}">
+  <div class="{{ wrapper_class }}">
     {%- if title is not empty -%}
       <h3>{{ title }}</h3>
     {%- endif -%}