diff --git a/src/applications/macro/controller/PhabricatorMacroViewController.php b/src/applications/macro/controller/PhabricatorMacroViewController.php
index 4e43c796cf..9ee70eecdc 100644
--- a/src/applications/macro/controller/PhabricatorMacroViewController.php
+++ b/src/applications/macro/controller/PhabricatorMacroViewController.php
@@ -40,7 +40,8 @@ final class PhabricatorMacroViewController
     $header = id(new PHUIHeaderView())
       ->setUser($viewer)
       ->setPolicyObject($macro)
-      ->setHeader($title_long);
+      ->setHeader($macro->getName())
+      ->setHeaderIcon('fa-file-image-o');
 
     if (!$macro->getIsDisabled()) {
       $header->setStatus('fa-check', 'bluegrey', pht('Active'));
@@ -177,7 +178,11 @@ final class PhabricatorMacroViewController
         $viewer->renderHandle($audio_phid));
     }
 
-    return $view;
+    if ($view->hasAnyProperties()) {
+      return $view;
+    }
+
+    return null;
   }
 
   private function buildFileView(