5 files changed, 67 insertions, 36 deletions
diff --git a/themes/default/css/fix-ie.css b/themes/default/css/fix-ie.css
index 00da956c..c83af92f 100644
--- a/themes/default/css/fix-ie.css
+++ b/themes/default/css/fix-ie.css
@@ -1,9 +1,14 @@
 /**
- * Fix display in IE 7 and earlier
+ * Fix display in IE
  */
 #gSiteMenu,
 #gBreadcrumbs,
 #gAlbumGrid,
-#gPager {
+#gPager,
+#gViewMenu {
   zoom: 1;
 }
+
+#gViewMenu a {
+  width: 52px !important;
+}
diff --git a/themes/default/css/screen.css b/themes/default/css/screen.css
index bd33aed5..d9c54c29 100644
--- a/themes/default/css/screen.css
+++ b/themes/default/css/screen.css
@@ -397,7 +397,7 @@ form p.gError {
 #gHeader #gQuickSearchForm {
   clear: right;
   float: right;
-  margin: 1.4em 20px;
+  margin: 1em 20px 0 0;
 }
 
 #gHeader #gQuickSearchForm input[type='text'] {
@@ -523,6 +523,7 @@ form p.gError {
 
 #gSiteMenu {
   border-bottom: 1px solid #ccc;
+  clear: none;
   padding: 0 20px 0;
 }
 
@@ -530,12 +531,15 @@ form p.gError {
   margin-bottom: 0;
 }
 
+#gViewMenu {
+  margin-bottom: 1em;
+}
+
 #gViewMenu a {
   background-repeat: no-repeat;
-  background-position: 10px 50%;
-  display: block;
-  height: 22px;
-  width: 29px;
+  background-position: 50% 50%;
+  height: 28px !important;
+  width: 43px !important;
 }
 
 #gViewMenu #gAlbumLink {
@@ -683,7 +687,8 @@ form p.gError {
 #gSiteMenu:after,
 #gBreadcrumbs:after,
 #gAlbumGrid:after,
-#gPager:after {
+#gPager:after,
+#gViewMenu:after {
   clear: both;
   content: ".";
   display: block;
@@ -756,22 +761,40 @@ form p.gError {
   display: none;
 }
 
-/* jQuery UI ThemeRoller butttons */
+/* jQuery UI ThemeRoller buttons */
 
 .gButtonLink {
   display: inline-block;
-  margin-bottom: 0;
-  padding: .1em .3em;
+  margin: 0 4px 0 0;
+  padding: .2em .4em;
+  position: relative;
+  outline: 0;
+  zoom: 1;
+}
+
+.gToolbar {
 }
 
+.gToolbar .gButtonSet {
+  padding-left: 1px;
+}
+
+.gToolbar .gButtonSet li {
+  float: left;
+}
+
+.gToolbar .gButtonLink {
+  margin: 0;
+ }
+
 .ui-icon-left .ui-icon {
   float: left;
-  margin-right: .3em;
+  margin-right: .2em;
 }
 
 .ui-icon-right .ui-icon {
   float: right;
-  margin-left: .3em;
+  margin-left: .2em;
 }
 
 /* STUFF THAT NEEDS A HOME */
diff --git a/themes/default/js/ui.init.js b/themes/default/js/ui.init.js
index 69768473..10f29f23 100644
--- a/themes/default/js/ui.init.js
+++ b/themes/default/js/ui.init.js
@@ -24,16 +24,27 @@ $(document).ready(function() {
     speed: 'fast'
   });
 
-  // Apply jQuery UI button css
-  $("input[type=submit]").addClass("fg-button ui-state-default");
+  // Apply jQuery UI button css to submit inputs
+  $("input[type=submit]").addClass("ui-state-default");
+  
   // Round view menu buttons
   if ($("#gViewMenu").length) {
-    $("#gViewMenu ul.gMenu").addClass("fg-buttonset");
-    $("#gViewMenu ul.gMenu li a").addClass("fg-button ui-state-default ui-icon");
-    $("#gViewMenu ul.gMenu li:first a").addClass("ui-corner-left");
-    $("#gViewMenu ul.gMenu li:last a").addClass("ui-corner-right");
+    $("#gViewMenu ul").removeClass("gMenu").removeClass("sf-menu");
+    $("#gViewMenu a").addClass("ui-icon ui-state-default");
+    $("#gViewMenu ul li:first a").addClass("ui-corner-left");
+    $("#gViewMenu ul li:last a").addClass("ui-corner-right");
   }
 
+    // Add hover state for buttons
+  $(".ui-state-default").hover(
+	  function(){
+		  $(this).addClass("ui-state-hover");
+	  },
+	  function(){
+		  $(this).removeClass("ui-state-hover");
+	  }
+  );
+
   // Short forms
   handleShortFormEvent(shortForms);
   if ($(".gShortForm").length) {
@@ -68,16 +79,6 @@ $(document).ready(function() {
   for (var i=0; i < dialogLinks.length; i++) {
     $(dialogLinks[i]).bind("click", handleDialogEvent);
   }
-  
-  // Add hover state for buttons
-  $(".ui-state-default").hover(
-	  function(){
-		  $(this).addClass("ui-state-hover");
-	  },
-	  function(){
-		  $(this).removeClass("ui-state-hover");
-	  }
-  );
 
 });
 
diff --git a/themes/default/views/page.html.php b/themes/default/views/page.html.php
index 418be89c..d463af1b 100644
--- a/themes/default/views/page.html.php
+++ b/themes/default/views/page.html.php
@@ -20,7 +20,7 @@
           media="screen,print,projection" />
     <link rel="stylesheet" type="text/css" href="<?= $theme->url("css/screen.css") ?>"
           media="screen,print,projection" />
-    <!--[if lt IE 8]>
+    <!--[if IE]>
     <link rel="stylesheet" type="text/css" href="<?= $theme->url("css/fix-ie.css") ?>"
           media="screen,print,projection" />
     <![endif]-->
diff --git a/themes/default/views/sidebar.html.php b/themes/default/views/sidebar.html.php
index d454804d..13bd3ce0 100644
--- a/themes/default/views/sidebar.html.php
+++ b/themes/default/views/sidebar.html.php
@@ -1,10 +1,12 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
-<div id="gViewMenu">
-<? if ($page_type == "album"):?>
-  <?= $theme->album_menu() ?>
-<? elseif ($page_type == "photo") : ?>
-  <?= $theme->photo_menu() ?>
-<? endif ?>
+<div class="gToolbar">
+  <div id="gViewMenu" class="gButtonSet">
+    <? if ($page_type == "album"):?>
+      <?= $theme->album_menu() ?>
+    <? elseif ($page_type == "photo") : ?>
+      <?= $theme->photo_menu() ?>
+    <? endif ?>
+  </div>
 </div>
 
 <?= $theme->sidebar_blocks() ?>