diff --git a/lib/stream.php b/lib/stream.php
index 62d1cd67c6..f41c125ca0 100644
--- a/lib/stream.php
+++ b/lib/stream.php
@@ -76,6 +76,13 @@ class StreamAction extends Action {
 		# XXX: RDFa
 		common_element_start('li', array('class' => 'notice_single',
 										  'id' => 'notice-' . $notice->id));
+		if ($user) {
+			if ($user->hasFave($notice)) {
+				common_disfavor_form($notice);
+			} else {
+				common_favor_form($notice);
+			}
+		}
 		$avatar = $profile->getAvatar(AVATAR_STREAM_SIZE);
 		common_element_start('a', array('href' => $profile->profileurl));
 		common_element('img', array('src' => ($avatar) ? common_avatar_display_url($avatar) : common_default_avatar(AVATAR_STREAM_SIZE),
@@ -138,13 +145,6 @@ class StreamAction extends Action {
 			common_raw('×');
 			common_element_end('a');
 		}
-		if ($user) {
-			if ($user->hasFave($notice)) {
-				common_disfavor_form($notice);
-			} else {
-				common_favor_form($notice);
-			}
-		}
 		common_element_end('p');
 		common_element_end('li');
 	}
diff --git a/theme/stoica/display.css b/theme/stoica/display.css
index a0f37fc4d8..a6de393bf3 100644
--- a/theme/stoica/display.css
+++ b/theme/stoica/display.css
@@ -649,6 +649,7 @@ input#openid_url {
 
 form#disfavor, form.disfavor  {
 	display: inline;
+	float: right;
 }
 
 input#disfavor, input.disfavor  {
@@ -662,6 +663,7 @@ input#disfavor, input.disfavor  {
 
 form#favor, form.favor  {
 	display: inline;
+	float: right;
 }
 
 input#favor, input.favor  {