diff --git a/media/css/reader.css b/media/css/reader.css
index 5aa1931b2..44e7939f6 100644
--- a/media/css/reader.css
+++ b/media/css/reader.css
@@ -3086,36 +3086,26 @@ body {
     max-width: 100%;
 }
 .NB-feed-story .NB-feed-story-content img {
-    max-width: max-content !important;    
-    margin-left: -28px;
-    width: calc(100% - 56px * -1) !important;
+    max-width: 100% !important;    
+    width: auto !important;
     height: auto;
     
     /* See http://www.newsblur.com/site/1031643/le-21me for width: auto, height: auto */
 }
 .NB-feed-story .NB-feed-story-content img.NB-medium-image {
-    max-width: max-content !important;    
-    margin: 0;
-    width: auto !important;
 }
 .NB-feed-story .NB-feed-story-content img.NB-small-image {
-    max-width: max-content !important;    
-    margin: 0;
-    width: auto !important;
 }
 .NB-feed-story .NB-feed-story-content img.NB-large-image {
-}
-.NB-feed-story .NB-feed-story-content img.NB-table-image.NB-large-image,
-.NB-feed-story .NB-feed-story-content img.NB-table-image.NB-medium-image {
     max-width: max-content !important;    
+    margin-left: -28px !important;
+    width: calc(100% - 56px * -1) !important;
+}
+.NB-feed-story .NB-feed-story-content img.NB-table-image.NB-large-image {
     margin: 0;
     width: 100% !important;
 }
-.NB-feed-story .NB-feed-story-content img.NB-table-image.NB-small-image {
-    max-width: max-content !important;    
-    margin: 0;
-    width: auto !important;
-}
+
 .NB-feed-story .NB-feed-story-content figure {
     margin: 0;
 }
diff --git a/media/js/newsblur/views/story_detail_view.js b/media/js/newsblur/views/story_detail_view.js
index 77e99f477..27b57b325 100644
--- a/media/js/newsblur/views/story_detail_view.js
+++ b/media/js/newsblur/views/story_detail_view.js
@@ -153,12 +153,13 @@ NEWSBLUR.Views.StoryDetailView = Backbone.View.extend({
                     largest = this.width;
                     $largest = $(this);
                 }
-                
-                // Can't even calculate widths because with tables, nothing fits
+                $(this).removeClass('NB-large-image').removeClass('NB-medium-image').removeClass('NB-small-image');
+                if (pane_width >= 900) return;
+
                 if (has_tables) {
+                    // Can't even calculate widths because with tables, nothing fits
                     $(this).addClass('NB-table-image');
                 }
-                
                 if (this.naturalWidth >= pane_width && this.naturalHeight >= 50) {
                     $(this).addClass('NB-large-image');
                 } else if (this.naturalWidth >= 100 && this.naturalHeight >= 50) {