diff --git a/include/admin/tpl/entries.inc.tpl b/include/admin/tpl/entries.inc.tpl
index 0bf866e2..b4e35f31 100644
--- a/include/admin/tpl/entries.inc.tpl
+++ b/include/admin/tpl/entries.inc.tpl
@@ -117,18 +117,6 @@
 
                 <h3><a href="?serendipity[action]=admin&amp;serendipity[adminModule]=entries&amp;serendipity[adminAction]=edit&amp;serendipity[id]={$entry.id}" title="#{$entry.id}">{$entry.title|escape|truncate:50:"&hellip;"}</a></h3>
 
-                <div class="entry_status">
-                {if !$showFutureEntries && ($entry.timestamp >= $serverOffsetHour)}
-                    <span class="status_future">{$CONST.ENTRY_PUBLISHED_FUTURE}</span>
-                {/if}
-                {if $entry.ep_is_sticky}
-                    <span class="status_sticky">{$CONST.STICKY_POSTINGS}</span>
-                {/if}
-                {if $entry.isdraft}
-                    <span class="status_draft">{$CONST.DRAFT}</span>
-                {/if}
-                </div>
-
                 <ul class="plainList clearfix actions">
                 {if $entry.preview || (!$showFutureEntries && ($entry.timestamp >= $serverOffsetHour))}
                     <li><a class="button_link" href="{$entry.preview_link}" title="{$CONST.PREVIEW} #{$entry.id}"><span class="icon-eye"></span><span class="visuallyhidden"> {$CONST.PREVIEW}</span></a></li>
@@ -139,7 +127,7 @@
                     <li><a class="button_link" href="?serendipity[action]=admin&amp;serendipity[adminModule]=entries&amp;serendipity[adminAction]=delete&amp;serendipity[id]={$entry.id}&amp;{$urltoken}" title="{$CONST.DELETE} #{$entry.id}" title="{$CONST.DELETE}"><span class="icon-trash"></span><span class="visuallyhidden"> {$CONST.DELETE}</span></a></li>
                 </ul>
 
-                <div class="entry_info">
+                <div class="entry_info clearfix">
                     <span class="status_timestamp">
                         {$entry.timestamp|@formatTime:"{$CONST.DATE_FORMAT_SHORT}"}{if $entry.timestamp <= ($entry.last_modified - 1800)} <a class="icon_link" href="#" title="{$CONST.LAST_UPDATED}: {$entry.last_modified|@formatTime:"{$CONST.DATE_FORMAT_SHORT}"}" onclick="alert(this.title)"><span class="icon-info-circle"></span><span class="visuallyhidden"> {$CONST.LAST_UPDATED}</span></a>{/if}
                     </span>
@@ -151,6 +139,15 @@
                       {/foreach}
                     {/if}
                     </span>
+                {if !$showFutureEntries && ($entry.timestamp >= $serverOffsetHour)}
+                    <span class="entry_status status_future">{$CONST.ENTRY_PUBLISHED_FUTURE}</span>
+                {/if}
+                {if $entry.ep_is_sticky}
+                    <span class="entry_status status_sticky">{$CONST.STICKY_POSTINGS}</span>
+                {/if}
+                {if $entry.isdraft}
+                    <span class="entry_status status_draft">{$CONST.DRAFT}</span>
+                {/if}
                 </div>
             </li>
         {/foreach}
diff --git a/templates/2k11/admin/style.css b/templates/2k11/admin/style.css
index 34344dfb..1a67d272 100644
--- a/templates/2k11/admin/style.css
+++ b/templates/2k11/admin/style.css
@@ -417,8 +417,7 @@ form > a,
 #media_pane_sort label,
 #image_directory_create_form label,
 #mediaPropertyForm .media_file_props label,
-#entries_list .entry_info span,
-.entry_status span {
+#entries_list .entry_info span {
     display: inline-block;
     *display: inline;
     *zoom: 1;
@@ -884,8 +883,7 @@ summary { cursor: pointer; }
     margin: 0 .4em 0 0;
 }
 
-#entries_list h3,
-#entries_list .entry_status {
+#entries_list h3 {
     float : left;
     margin: .75em 1em .75em 0;
 }
@@ -1073,15 +1071,15 @@ fieldset p,
 
 #entries_list .icon_link { height: 24px; }
 
-.entry_status span {
+.entry_status {
     background: #888;
     color: #fff;
-    padding: 0 10px;
-    -webkit-border-radius: 15px;
-    -moz-border-radius: 15px;
-    -ms-border-radius: 15px;
-    -o-border-radius: 15px;
-    border-radius: 15px;
+    padding: 0 4px;
+}
+
+#entries_list .entry_info .entry_status {
+    float: right;
+    margin: 0 .4em .75em 0;
 }
 
 /* FOOTER