2 files changed, 23 insertions, 9 deletions
diff --git a/views/default/css/elements/core.php b/views/default/css/elements/core.php
index 61dcdb1fe..af4a1882a 100644
--- a/views/default/css/elements/core.php
+++ b/views/default/css/elements/core.php
@@ -96,9 +96,6 @@
 .elgg-menu-hz > li > span {
 	/* Google says do this, but why? */
 	position: relative;
-	
-	/* FF2 */
-	display: -moz-inline-box;
 
 	display: inline-block;
 	
@@ -106,6 +103,3 @@
 	zoom: 1;
 	*display: inline;
 }
-
-/* Looks much better when middle-aligned with surrounding text */
-.elgg-icon {vertical-align:middle}
-\ No newline at end of file
diff --git a/views/default/css/elements/navigation.php b/views/default/css/elements/navigation.php
index d930d3a89..cde978138 100644
--- a/views/default/css/elements/navigation.php
+++ b/views/default/css/elements/navigation.php
@@ -421,20 +421,27 @@ li:hover > .elgg-menu-site-more {
 /* ***************************************
 	ENTITY
 *************************************** */
+<?php // height depends on line height/font size ?>
 .elgg-menu-entity {
 	float: right;
 	margin-left: 15px;
 	font-size: 90%;
 	color: #aaa;
+	line-height: 16px;
+	height: 16px;
 }
 .elgg-menu-entity > li {
-	display: inline-block;
 	margin-left: 15px;
 }
-<?php // height depends on line height/font size ?>
 .elgg-menu-entity > li > a {
 	color: #aaa;
-	height: 18px;
+}
+<?php // need to override .elgg-menu-hz ?>
+.elgg-menu-entity > li > a {
+	display: block;
+}
+.elgg-menu-entity > li > span {
+	vertical-align: baseline;
 }
 
 /* ***************************************
@@ -476,11 +483,24 @@ li:hover > .elgg-menu-site-more {
 	margin-left: 15px;
 	font-size: 90%;
 	color: #aaa;
+	line-height: 16px;
+	height: 16px;
 }
 .elgg-menu-river > li {
 	display: inline-block;
 	margin-left: 5px;
 }
+.elgg-menu-river > li > a {
+	color: #aaa;
+	height: 16px;
+}
+<?php // need to override .elgg-menu-hz ?>
+.elgg-menu-river > li > a {
+	display: block;
+}
+.elgg-menu-river > li > span {
+	vertical-align: baseline;
+}
 
 /* ***************************************
 	SIDEBAR EXTRAS (rss, bookmark, etc)