3 files changed, 8 insertions, 1 deletions
diff --git a/views/default/css/elements/core.php b/views/default/css/elements/core.php
index 879427583..e8e18bec3 100644
--- a/views/default/css/elements/core.php
+++ b/views/default/css/elements/core.php
@@ -199,6 +199,9 @@ h2 {
 .elgg-list > li {
 	border-bottom: 1px dotted #CCCCCC;
 }
+.elgg-gallery, .elgg-gallery > li {
+	border: none;
+}
 .elgg-list-metadata {
 	float: right;
 	margin-left: 15px;
diff --git a/views/default/layout/objects/list.php b/views/default/layout/objects/list.php
index 6d12c5e55..0ab3d5482 100644
--- a/views/default/layout/objects/list.php
+++ b/views/default/layout/objects/list.php
@@ -31,6 +31,10 @@ if (isset($vars['list_class'])) {
 	$list_class = "{$vars['list_class']} $list_class";
 }
 
+if (elgg_in_context('gallery')) {
+	$list_class = "$list_class elgg-gallery";
+}
+
 $item_class = 'elgg-list-item';
 if (isset($vars['item_class'])) {
 	$item_class = "{$vars['item_class']} $item_class";
diff --git a/views/default/layout/objects/list/metadata.php b/views/default/layout/objects/list/metadata.php
index 43bfaf50b..f2038f88b 100644
--- a/views/default/layout/objects/list/metadata.php
+++ b/views/default/layout/objects/list/metadata.php
@@ -38,7 +38,7 @@ if ($entity->canEdit() && $handler) {
 		'text' => '<span class="elgg-icon elgg-icon-delete"></span>',
 		'title' => elgg_echo('delete'),
 		'confirm' => elgg_echo('deleteconfirm'),
-		'encode' => false,
+		'text_encode' => false,
 	));
 	echo "<li>$delete_link</li>";
 }