diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index f3f91021ea..0765b9c95b 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -7,7 +7,7 @@
  */
 return array(
   'names' => array(
-    'core.pkg.css' => '856b962f',
+    'core.pkg.css' => 'efdeeb14',
     'core.pkg.js' => '5f50c01b',
     'darkconsole.pkg.js' => '8ab24e01',
     'differential.pkg.css' => '1940be3f',
@@ -105,7 +105,7 @@ return array(
     'rsrc/css/application/tokens/tokens.css' => '3d0f239e',
     'rsrc/css/application/uiexample/example.css' => '528b19de',
     'rsrc/css/core/core.css' => '86bfbe8c',
-    'rsrc/css/core/remarkup.css' => '2dbff225',
+    'rsrc/css/core/remarkup.css' => 'bc65f3cc',
     'rsrc/css/core/syntax.css' => '56c1ba38',
     'rsrc/css/core/z-index.css' => '2db67397',
     'rsrc/css/diviner/diviner-shared.css' => '38813222',
@@ -353,7 +353,7 @@ return array(
     'rsrc/js/application/auth/behavior-persona-login.js' => '9414ff18',
     'rsrc/js/application/config/behavior-reorder-fields.js' => '14a827de',
     'rsrc/js/application/conpherence/ConpherenceThreadManager.js' => '0324970d',
-    'rsrc/js/application/conpherence/behavior-durable-column.js' => '64fc1053',
+    'rsrc/js/application/conpherence/behavior-durable-column.js' => '44100dc7',
     'rsrc/js/application/conpherence/behavior-menu.js' => 'c4151295',
     'rsrc/js/application/conpherence/behavior-pontificate.js' => '21ba5861',
     'rsrc/js/application/conpherence/behavior-quicksand-blacklist.js' => '7927a7d3',
@@ -585,7 +585,7 @@ return array(
     'javelin-behavior-diffusion-locate-file' => '6d3e1947',
     'javelin-behavior-diffusion-pull-lastmodified' => '2b228192',
     'javelin-behavior-doorkeeper-tag' => 'e5822781',
-    'javelin-behavior-durable-column' => '64fc1053',
+    'javelin-behavior-durable-column' => '44100dc7',
     'javelin-behavior-error-log' => '6882e80a',
     'javelin-behavior-fancy-datepicker' => 'c51ae228',
     'javelin-behavior-global-drag-and-drop' => '07f199d8',
@@ -739,7 +739,7 @@ return array(
     'phabricator-phtize' => 'd254d646',
     'phabricator-prefab' => '72da38cc',
     'phabricator-profile-css' => '1a20dcbf',
-    'phabricator-remarkup-css' => '2dbff225',
+    'phabricator-remarkup-css' => 'bc65f3cc',
     'phabricator-search-results-css' => '559cc554',
     'phabricator-shaped-request' => '7cbe244b',
     'phabricator-side-menu-view-css' => '7e8c6341',
@@ -1110,6 +1110,15 @@ return array(
       'javelin-dom',
       'javelin-request',
     ),
+    '44100dc7' => array(
+      'javelin-behavior',
+      'javelin-dom',
+      'javelin-stratcom',
+      'javelin-scrollbar',
+      'javelin-quicksand',
+      'phabricator-keyboard-shortcut',
+      'conpherence-thread-manager',
+    ),
     '44168bad' => array(
       'javelin-behavior',
       'javelin-dom',
@@ -1257,15 +1266,6 @@ return array(
       'javelin-dom',
       'javelin-fx',
     ),
-    '64fc1053' => array(
-      'javelin-behavior',
-      'javelin-dom',
-      'javelin-stratcom',
-      'javelin-scrollbar',
-      'javelin-quicksand',
-      'phabricator-keyboard-shortcut',
-      'conpherence-thread-manager',
-    ),
     '6882e80a' => array(
       'javelin-dom',
     ),
diff --git a/src/applications/files/markup/PhabricatorEmbedFileRemarkupRule.php b/src/applications/files/markup/PhabricatorEmbedFileRemarkupRule.php
index f8efaa1a14..2572c440b7 100644
--- a/src/applications/files/markup/PhabricatorEmbedFileRemarkupRule.php
+++ b/src/applications/files/markup/PhabricatorEmbedFileRemarkupRule.php
@@ -96,6 +96,8 @@ final class PhabricatorEmbedFileRemarkupRule
         case 'full':
           $attrs += array(
             'src' => $file->getBestURI(),
+            'height' => $file->getImageHeight(),
+            'width' => $file->getImageWidth(),
           );
           $image_class = 'phabricator-remarkup-embed-image-full';
           break;
diff --git a/src/applications/macro/markup/PhabricatorImageMacroRemarkupRule.php b/src/applications/macro/markup/PhabricatorImageMacroRemarkupRule.php
index 965064b4a4..ec0ced4c1f 100644
--- a/src/applications/macro/markup/PhabricatorImageMacroRemarkupRule.php
+++ b/src/applications/macro/markup/PhabricatorImageMacroRemarkupRule.php
@@ -113,17 +113,6 @@ final class PhabricatorImageMacroRemarkupRule extends PhutilRemarkupRule {
         $src_uri = PhabricatorEnv::getProductionURI($src_uri);
       }
 
-      $file_data = $file->getMetadata();
-      $style = null;
-      $height = idx($file_data, PhabricatorFile::METADATA_IMAGE_HEIGHT);
-      $width = idx($file_data, PhabricatorFile::METADATA_IMAGE_WIDTH);
-      if ($height && $width) {
-        $style = sprintf(
-          'height: %dpx; width: %dpx;',
-          $height,
-          $width);
-      }
-
       $id = null;
       $audio = idx($files, $macro->getAudioPHID());
       $should_play = ($audio && $macro->getAudioBehavior() !=
@@ -154,7 +143,9 @@ final class PhabricatorImageMacroRemarkupRule extends PhutilRemarkupRule {
           'src'   => $src_uri,
           'alt'   => $spec['original'],
           'title' => $spec['original'],
-          'style' => $style,
+          'height' => $file->getImageHeight(),
+          'width' => $file->getImageWidth(),
+          'class' => 'phabricator-remarkup-macro',
         ));
 
       $engine->overwriteStoredText($spec['token'], $result);
diff --git a/src/applications/macro/markup/PhabricatorMemeRemarkupRule.php b/src/applications/macro/markup/PhabricatorMemeRemarkupRule.php
index 0b65226e09..df15548e54 100644
--- a/src/applications/macro/markup/PhabricatorMemeRemarkupRule.php
+++ b/src/applications/macro/markup/PhabricatorMemeRemarkupRule.php
@@ -55,6 +55,7 @@ final class PhabricatorMemeRemarkupRule extends PhutilRemarkupRule {
         array(
           'src' => $uri,
           'alt' => $alt_text,
+          'class' => 'phabricator-remarkup-macro',
         ));
     }
 
diff --git a/webroot/rsrc/css/core/remarkup.css b/webroot/rsrc/css/core/remarkup.css
index 34602363d3..d64fdf6e0f 100644
--- a/webroot/rsrc/css/core/remarkup.css
+++ b/webroot/rsrc/css/core/remarkup.css
@@ -300,6 +300,7 @@
 }
 
 .phabricator-remarkup-embed-image-full img {
+  height: auto;
   max-width: 100%;
 }
 
@@ -488,6 +489,11 @@ var.remarkup-assist-textarea {
   max-width: 95%;
 }
 
+.phabricator-remarkup-macro {
+  height: auto;
+  max-width: 100%;
+}
+
 .remarkup-nav-sequence-arrow {
   color: {$lightgreytext};
 }