diff --git a/src/applications/macro/markup/PhabricatorIconRemarkupRule.php b/src/applications/macro/markup/PhabricatorIconRemarkupRule.php
--- a/src/applications/macro/markup/PhabricatorIconRemarkupRule.php
+++ b/src/applications/macro/markup/PhabricatorIconRemarkupRule.php
@@ -41,6 +41,7 @@
 
     $defaults = array(
       'color' => null,
+      'spin' => false,
     );
 
     $options = idx($extra, 1, '');
@@ -70,8 +71,16 @@
       $color = null;
     }
 
+    $classes = array();
+    $classes[] = $color;
+
+    $spin = $options['spin'];
+    if ($spin) {
+      $classes[] = 'ph-spin';
+    }
+
     $icon_view = id(new PHUIIconView())
-      ->setIconFont('fa-'.$icon, $color);
+      ->setIconFont('fa-'.$icon, implode(' ', $classes));
 
     return $this->getEngine()->storeText($icon_view);
   }
diff --git a/src/docs/user/userguide/remarkup.diviner b/src/docs/user/userguide/remarkup.diviner
--- a/src/docs/user/userguide/remarkup.diviner
+++ b/src/docs/user/userguide/remarkup.diviner
@@ -496,6 +496,12 @@
 [[ http://fortawesome.github.io/Font-Awesome/ | FontAwesome ]], so you can also
 browse the collection there.)
 
+You can add `spin` to make the icon spin:
+
+  {icon cog spin}
+
+This renders: {icon cog spin}
+
 
 = Phriction Documents =