diff --git a/homebox-block.tpl.php b/homebox-block.tpl.php
index 11876be..5173090 100644
--- a/homebox-block.tpl.php
+++ b/homebox-block.tpl.php
@@ -10,12 +10,12 @@
   <div class="homebox-portlet-inner">
     <h3 class="portlet-header">
       <?php if ($block->closable): ?>
-        <a class="portlet-icon portlet-close"></a>
+      <button class="portlet-icon portlet-close"><span class="element-invisible">Close</span></button>
       <?php endif; ?>
-      <a class="portlet-icon portlet-maximize"></a>
-      <a class="portlet-icon portlet-minus"></a>
+      <button class="portlet-icon portlet-maximize" class="element-invisible"><span class="element-invisible">Maximize</span></button>
+      <button class="portlet-icon portlet-minus" class="element-invisible"><span class="element-invisible">Minimize</span></button>
       <?php if ($page->settings['color'] || isset($block->edit_form)): ?>
-        <a class="portlet-icon portlet-settings"></a>
+        <button class="portlet-icon portlet-settings"><span class="element-invisible">Settings</span></button>
       <?php endif; ?>
       <span class="portlet-title"><?php print $block->subject ?></span>
     </h3>
@@ -24,7 +24,9 @@
         <div class="clearfix"><div class="homebox-colors">
           <span class="homebox-color-message"><?php print t('Select a color') . ':'; ?></span>
           <?php for ($i=0; $i < HOMEBOX_NUMBER_OF_COLOURS; $i++): ?>
-            <span class="homebox-color-selector" style="background-color: <?php print $page->settings['colors'][$i] ?>;">&nbsp;</span>
+            <button class="homebox-color-selector" style="background-color: <?php print $page->settings['colors'][$i] ?>;">
+              <span class="element-invisible">Color: <?php print $page->settings['colors'][$i] ?></span>
+            </button>
           <?php endfor ?>
         </div></div>
       <?php endif; ?>
diff --git a/homebox.css b/homebox.css
index a2fddf3..9853490 100644
--- a/homebox.css
+++ b/homebox.css
@@ -83,6 +83,9 @@
   z-index: 10; /* IE is terrible */
   position: relative; /* IE is terrible */
 }
+.portlet-icon:hover, .portlet-icon:focus {
+  background: #red; /* just for testing */
+}
 .portlet-header .portlet-settings {
   background: url(images/settings.gif);
 }