diff --git a/plugins/UserFlag/userflag.css b/plugins/UserFlag/userflag.css
index d69c2467f9..98da24cc94 100644
--- a/plugins/UserFlag/userflag.css
+++ b/plugins/UserFlag/userflag.css
@@ -2,54 +2,3 @@
 .entity_flag p {
 background:url(icon_flag.gif) 5px 5px no-repeat;
 }
-.entity_sandbox input.submit,
-.entity_sandbox p {
-background:url(icon_sandbox.gif) 5px 5px no-repeat;
-}
-.entity_silence input.submit,
-.entity_silence p {
-background:url(icon_silence.gif) 5px 5px no-repeat;
-}
-.entity_delete input.submit,
-.entity_delete p {
-background:url(icon_skull.gif) 5px 5px no-repeat;
-}
-
-.entity_moderation {
-position:relative;
-}
-.entity_moderation p {
-background:transparent url(icon_badge.gif) 5px 5px no-repeat;
-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3);
--moz-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3);
--webkit-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.25);
-border-radius:4px;
--moz-border-radius:4px;
--webkit-border-radius:4px;
-font-weight:bold;
-padding-bottom:2px;
-margin-bottom:7px;
-
-color:#002FA7;
-}
-.entity_moderation ul {
-display:none;
-}
-.entity_moderation:hover ul {
-display:block;
-background-color:#FFFFFF;
-min-width:21%;
-width:100%;
-border:1px solid #DDDDDD;
-padding:11px;
-position:absolute;
-top:-1px;
-right:-1px;
-z-index:1;
-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3);
--moz-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3);
--webkit-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.25);
-border-radius:7px;
--moz-border-radius:7px;
--webkit-border-radius:7px;
-}
diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 33d5ba07e4..c9aa81cfb7 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -750,6 +750,35 @@ display:none;
 text-align:center;
 }
 
+.entity_moderation {
+position:relative;
+}
+.entity_moderation p {
+border-radius:4px;
+-moz-border-radius:4px;
+-webkit-border-radius:4px;
+font-weight:bold;
+padding-bottom:2px;
+margin-bottom:7px;
+}
+.entity_moderation ul {
+display:none;
+}
+.entity_moderation:hover ul {
+display:block;
+min-width:21%;
+width:100%;
+padding:11px;
+position:absolute;
+top:-1px;
+right:-1px;
+z-index:1;
+border-width:1px;
+border-style:solid;
+border-radius:7px;
+-moz-border-radius:7px;
+-webkit-border-radius:7px;
+}
 
 .entity_tags ul {
 list-style-type:none;
diff --git a/theme/base/images/icons/icons-01.gif b/theme/base/images/icons/icons-01.gif
index f19d6a3f68..e910c86c00 100644
Binary files a/theme/base/images/icons/icons-01.gif and b/theme/base/images/icons/icons-01.gif differ
diff --git a/plugins/UserFlag/icon_badge.gif b/theme/base/images/icons/twotone/green/badge.gif
similarity index 100%
rename from plugins/UserFlag/icon_badge.gif
rename to theme/base/images/icons/twotone/green/badge.gif
diff --git a/plugins/UserFlag/icon_sandbox.gif b/theme/base/images/icons/twotone/green/sandbox.gif
similarity index 100%
rename from plugins/UserFlag/icon_sandbox.gif
rename to theme/base/images/icons/twotone/green/sandbox.gif
diff --git a/plugins/UserFlag/icon_silence.gif b/theme/base/images/icons/twotone/green/silence.gif
similarity index 100%
rename from plugins/UserFlag/icon_silence.gif
rename to theme/base/images/icons/twotone/green/silence.gif
diff --git a/plugins/UserFlag/icon_skull.gif b/theme/base/images/icons/twotone/green/skull.gif
similarity index 100%
rename from plugins/UserFlag/icon_skull.gif
rename to theme/base/images/icons/twotone/green/skull.gif
diff --git a/theme/default/css/display.css b/theme/default/css/display.css
index 00cac0ea37..4b1c269675 100644
--- a/theme/default/css/display.css
+++ b/theme/default/css/display.css
@@ -40,7 +40,8 @@ box-shadow:3px 3px 7px rgba(194, 194, 194, 0.3);
 .entity_send-a-message .form_notice,
 .pagination .nav_prev a,
 .pagination .nav_next a,
-.form_settings fieldset fieldset {
+.form_settings fieldset fieldset,
+.entity_moderation:hover ul {
 border-color:#DDDDDD;
 }
 
@@ -61,6 +62,7 @@ input.submit,
 .entity_remote_subscribe,
 .entity_actions a,
 .entity_actions input,
+.entity_moderation p,
 button {
 box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3);
 -moz-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3);
@@ -89,7 +91,8 @@ a,
 .form_settings input.form_action-primary,
 .notice-options input,
 .entity_actions a,
-.entity_actions input {
+.entity_actions input,
+.entity_moderation p {
 color:#002FA7;
 }
 
@@ -144,7 +147,11 @@ button.close,
 .form_user_unsubscribe input.submit,
 .form_group_join input.submit,
 .form_user_subscribe input.submit,
-.entity_subscribe a {
+.entity_subscribe a,
+.entity_moderation p,
+.entity_sandbox input.submit,
+.entity_silence input.submit,
+.entity_delete input.submit {
 background-image:url(../../base/images/icons/icons-01.gif);
 background-repeat:no-repeat;
 background-color:transparent;
@@ -169,7 +176,8 @@ border-color:transparent;
 }
 #content,
 #site_nav_local_views .current a,
-.entity_send-a-message .form_notice {
+.entity_send-a-message .form_notice,
+.entity_moderation:hover ul {
 background-color:#FFFFFF;
 }
 
@@ -252,7 +260,8 @@ background-position: 5px -718px;
 .entity_send-a-message a {
 background-position: 5px -852px;
 }
-.entity_send-a-message .form_notice {
+.entity_send-a-message .form_notice,
+.entity_moderation:hover ul {
 box-shadow:3px 7px 5px rgba(194, 194, 194, 0.7);
 -moz-box-shadow:3px 7px 5px rgba(194, 194, 194, 0.7);
 -webkit-box-shadow:3px 7px 5px rgba(194, 194, 194, 0.7);
@@ -271,6 +280,18 @@ background-position: 5px -918px;
 .form_make_admin input.submit {
 background-position: 5px -983px;
 }
+.entity_moderation p {
+background-position: 5px -1313px;
+}
+.form_user_sandbox input.submit {
+background-position: 5px -1380px;
+}
+.form_user_silence input.submit {
+background-position: 5px -1445px;
+}
+.form_user_deleteuser input.submit {
+background-position: 5px -1511px;
+}
 
 /* NOTICES */
 .notice .attachment {
diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css
index 12541341d1..8bacd76732 100644
--- a/theme/identica/css/display.css
+++ b/theme/identica/css/display.css
@@ -40,7 +40,8 @@ box-shadow:3px 3px 7px rgba(194, 194, 194, 0.3);
 .entity_send-a-message .form_notice,
 .pagination .nav_prev a,
 .pagination .nav_next a,
-.form_settings fieldset fieldset {
+.form_settings fieldset fieldset,
+.entity_moderation:hover ul {
 border-color:#DDDDDD;
 }
 
@@ -61,6 +62,7 @@ input.submit,
 .entity_remote_subscribe,
 .entity_actions a,
 .entity_actions input,
+.entity_moderation p,
 button {
 box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3);
 -moz-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3);
@@ -89,7 +91,8 @@ a,
 .form_settings input.form_action-primary,
 .notice-options input,
 .entity_actions a,
-.entity_actions input {
+.entity_actions input,
+.entity_moderation p {
 color:#002FA7;
 }
 
@@ -144,7 +147,11 @@ button.close,
 .form_user_unsubscribe input.submit,
 .form_group_join input.submit,
 .form_user_subscribe input.submit,
-.entity_subscribe a {
+.entity_subscribe a,
+.entity_moderation p,
+.entity_sandbox input.submit,
+.entity_silence input.submit,
+.entity_delete input.submit {
 background-image:url(../../base/images/icons/icons-01.gif);
 background-repeat:no-repeat;
 background-color:transparent;
@@ -169,7 +176,8 @@ border-color:transparent;
 }
 #content,
 #site_nav_local_views .current a,
-.entity_send-a-message .form_notice {
+.entity_send-a-message .form_notice,
+.entity_moderation:hover ul {
 background-color:#FFFFFF;
 }
 
@@ -251,7 +259,8 @@ background-position: 5px -718px;
 .entity_send-a-message a {
 background-position: 5px -852px;
 }
-.entity_send-a-message .form_notice {
+.entity_send-a-message .form_notice,
+.entity_moderation:hover ul {
 box-shadow:3px 7px 5px rgba(194, 194, 194, 0.7);
 -moz-box-shadow:3px 7px 5px rgba(194, 194, 194, 0.7);
 -webkit-box-shadow:3px 7px 5px rgba(194, 194, 194, 0.7);
@@ -270,6 +279,18 @@ background-position: 5px -918px;
 .form_make_admin input.submit {
 background-position: 5px -983px;
 }
+.entity_moderation p {
+background-position: 5px -1313px;
+}
+.form_user_sandbox input.submit {
+background-position: 5px -1380px;
+}
+.form_user_silence input.submit {
+background-position: 5px -1445px;
+}
+.form_user_deleteuser input.submit {
+background-position: 5px -1511px;
+}
 
 /* NOTICES */
 .notice .attachment {