diff --git a/CHANGES.rst b/CHANGES.rst
index 9d318c431..a40a44f60 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -35,6 +35,10 @@ New features:
 
 Bug fixes:
 
+- fixed css-classes for thumb scales ...
+  https://github.com/plone/Products.CMFPlone/issues/2077
+  [fgrcon]
+
 - Fix test for checking if TinyMCE is loaded which broke after https://github.com/plone/Products.CMFPlone/pull/2059
   [thet]
 
diff --git a/plone/app/contenttypes/browser/templates/listing.pt b/plone/app/contenttypes/browser/templates/listing.pt
index 04529764c..1933a24c1 100644
--- a/plone/app/contenttypes/browser/templates/listing.pt
+++ b/plone/app/contenttypes/browser/templates/listing.pt
@@ -23,7 +23,7 @@
                          thumb_scale_list view/get_thumb_scale_list;
                          thumb_scale_table view/get_thumb_scale_table;
                          thumb_scale_summary view/get_thumb_scale_summary;
-                         img_class python:'image-%s pull-right' % thumb_scale_list;
+                         img_class python:'thumb-%s pull-right' % thumb_scale_list;
                          showicons view/show_icons">
       <tal:listing condition="batch">
         <div class="entries" metal:define-slot="entries"
diff --git a/plone/app/contenttypes/browser/templates/listing_summary.pt b/plone/app/contenttypes/browser/templates/listing_summary.pt
index 1f148283d..ddf660a43 100644
--- a/plone/app/contenttypes/browser/templates/listing_summary.pt
+++ b/plone/app/contenttypes/browser/templates/listing_summary.pt
@@ -32,7 +32,7 @@
                tal:condition="python: item_has_image and thumb_scale_summary"
                tal:attributes="class python: 'tileImage' if item_description else 'tileImageNoFloat'">
             <a tal:attributes="href item_link">
-              <img tal:replace="structure python:image_scale.tag(item, 'image', scale=thumb_scale_summary, css_class='image-' + thumb_scale_summary)" />
+              <img tal:replace="structure python:image_scale.tag(item, 'image', scale=thumb_scale_summary, css_class='thumb-' + thumb_scale_summary)" />
 
             </a>
           </div>
diff --git a/plone/app/contenttypes/browser/templates/listing_tabular.pt b/plone/app/contenttypes/browser/templates/listing_tabular.pt
index 08efd0545..9758f11d5 100644
--- a/plone/app/contenttypes/browser/templates/listing_tabular.pt
+++ b/plone/app/contenttypes/browser/templates/listing_tabular.pt
@@ -26,7 +26,7 @@
       <div class="has-table">
         <table
             tal:define="thumb_scale_table view/get_thumb_scale_table;
-                        img_class python:'image-%s pull-right' % thumb_scale_table;
+                        img_class python:'thumb-%s pull-right' % thumb_scale_table;
                         showicons  view/show_icons;
                         "
             class="listing"