diff --git a/templates/2k11/admin/images.inc.tpl b/templates/2k11/admin/images.inc.tpl
index 17bfb91e..c6b1934d 100644
--- a/templates/2k11/admin/images.inc.tpl
+++ b/templates/2k11/admin/images.inc.tpl
@@ -78,7 +78,7 @@
     <input class="go_back" type="button" value="{$CONST.BACK}">
     {else}
     <script>location.href="?serendipity[adminModule]=images&serendipity[adminAction]=default";</script>
-    <noscript><a href="?serendipity[adminModule]=images&amp;serendipity[adminAction]=default">{$CONST.DONE}</a></noscript>
+    <noscript><a class="button_link icon_link standalone" href="?serendipity[adminModule]=images&amp;serendipity[adminAction]=default">{$CONST.DONE}</a></noscript>
     {/if}
 {/if}
 
@@ -91,7 +91,7 @@
 {if $case_add}
     {if $smarty.post.adminSubAction == 'properties'}
     <script>location.href="?serendipity[adminModule]=images&serendipity[adminAction]=default";</script>
-    <noscript><a href="?serendipity[adminModule]=images&amp;serendipity[adminAction]=default">{$CONST.DONE}</a></noscript>
+    <noscript><a class="button_link icon_link standalone" href="?serendipity[adminModule]=images&amp;serendipity[adminAction]=default">{$CONST.DONE}</a></noscript>
     {else}
     {$showML_add}
     {/if}
@@ -258,13 +258,13 @@
 {if $case_rotateCW}
     {if $rotate_img_done}
     <script>location.href="{$adminFile_redirect}";</script>
-    <noscript><a href="{$adminFile_redirect}">{$CONST.DONE}</a></noscript>
+    <noscript><a class="button_link icon_link standalone" href="{$adminFile_redirect}">{$CONST.DONE}</a></noscript>
     {/if}
 {/if}
 {if $case_rotateCCW}
     {if $rotate_img_done}
     <script>location.href="{$adminFile_redirect}";</script>
-    <noscript><a href="{$adminFile_redirect}">{$CONST.DONE}</a></noscript>
+    <noscript><a class="button_link icon_link standalone" href="{$adminFile_redirect}">{$CONST.DONE}</a></noscript>
     {/if}
 {/if}
 {if $case_scale}
@@ -272,7 +272,7 @@
     {if $print_serendipity_scaleImg}<span class="msg_notice"><span class="icon-info-circled"></span> {$print_serendipity_scaleImg}</span>{/if}
     <span class="msg_notice"><span class="icon-info-circled"></span> {$CONST.DONE}</span>
     <script>location.href="?serendipity[adminModule]=images&serendipity[adminAction]=default";</script>
-    <noscript><a href="?serendipity[adminModule]=images&amp;serendipity[adminAction]=default">{$CONST.DONE}</a></noscript>
+    <noscript><a class="button_link icon_link standalone" href="?serendipity[adminModule]=images&amp;serendipity[adminAction]=default">{$CONST.DONE}</a></noscript>
 {/if}
 {if $case_scaleSelect}
     {if $print_RESIZE_BLAHBLAH}<h2>{$print_RESIZE_BLAHBLAH}</h2>{/if}
diff --git a/templates/2k11/admin/show_plugins.fnc.tpl b/templates/2k11/admin/show_plugins.fnc.tpl
index 0f3f2b3f..3a299261 100644
--- a/templates/2k11/admin/show_plugins.fnc.tpl
+++ b/templates/2k11/admin/show_plugins.fnc.tpl
@@ -73,7 +73,6 @@
                             </li>
                             <li class="pluginmanager_move">
                                 {if $plugin_data.sort_idx == 0}
-                                    &nbsp;
                                 {else}
                                     <a href="?{$serendipity_setFormTokenUrl}&amp;serendipity[adminModule]=plugins&amp;submit=move+up&amp;serendipity[plugin_to_move]={$plugin_data.key}{if $event_only}&amp;serendipity[event_plugin]=true{/if}">
                                         <span class="icon-up-open"></span><span class="visuallyhidden"> UP</span>
@@ -81,7 +80,6 @@
                                 {/if}
 
                                 {if $sort_idx == $total - 1}
-                                    &nbsp;
                                 {else}
                                     <a href="?{$serendipity_setFormTokenUrl}&amp;serendipity[adminModule]=plugins&amp;submit=move+down&amp;serendipity[plugin_to_move]={$plugin_data.key}{if $event_only}&amp;serendipity[event_plugin]=true{/if}">
                                         <span class="icon-down-open"></span><span class="visuallyhidden"> DOWN</span>
diff --git a/templates/2k11/admin/style.css b/templates/2k11/admin/style.css
index 352d7f2d..215b497a 100644
--- a/templates/2k11/admin/style.css
+++ b/templates/2k11/admin/style.css
@@ -1354,6 +1354,10 @@ fieldset p,
     margin: 0 .4em 0 0;
 }
 
+.no-js .media_file .actions li {
+    margin: 0 .4em 0 -.4em;
+}
+
 .editor_toolbar input {
     margin: 0 .25em .75em 0;
 }
@@ -1735,12 +1739,14 @@ form > .button_link:first-of-type,
 }
 
 .pluginmanager .pluginmanager_grablet,
-.pluginmanager .pluginmanager_configure {
+.pluginmanager .pluginmanager_configure,
+.pluginmanager_move {
     position: absolute;
     top: 5px;
 }
 
-.pluginmanager .pluginmanager_grablet {
+.pluginmanager .pluginmanager_grablet,
+.pluginmanager_move {
     left: 5px;
 }
 
@@ -1841,6 +1847,11 @@ form > .button_link:first-of-type,
 .no-js .template_show_info,
 .no-js #serendipity_comments_list .comment_summary,
 .no-js .editor_toolbar,
+.no-js #s9y_links > span,
+.no-js .toggle_info .info-icon-circled,
+.no-js .pluginmanager_grablet,
+.no-js .image_resize_hint,
+.no-js #serendipityScaleForm > .form_check,
 .js .additional_info,
 .installer .toggle_info,
 .hidden {