diff --git a/demos/button/toolbar.html b/demos/button/toolbar.html
index 5be3668f624..62c1ca83a48 100644
--- a/demos/button/toolbar.html
+++ b/demos/button/toolbar.html
@@ -11,12 +11,12 @@
 	<link rel="stylesheet" href="../demos.css">
 	<style>
 	#toolbar {
-		padding: 11px 4px 9px 4px;
+		padding: 4px;
+		display: inline-block;
 	}
-
 	/* support: IE7 */
-	*:first-child+html #toolbar {
-		padding: 4px 0px 4px 5px;
+	*+html #toolbar {
+		display: inline;
 	}
 	</style>
 	<script>
@@ -91,7 +91,7 @@
 </head>
 <body>
 
-<span id="toolbar" class="ui-widget-header ui-corner-all">
+<div id="toolbar" class="ui-widget-header ui-corner-all">
 	<button id="beginning">go to beginning</button>
 	<button id="rewind">rewind</button>
 	<button id="play">play</button>
@@ -106,12 +106,12 @@
 		<input type="radio" id="repeat1" name="repeat" /><label for="repeat1">Once</label>
 		<input type="radio" id="repeatall" name="repeat" /><label for="repeatall">All</label>
 	</span>
-</span>
+</div>
 
 <div class="demo-description">
 <p>
 	A mediaplayer toolbar. Take a look at the underlying markup: A few button elements,
-	an input of type checkbox for the Shuffle button, and three inputs of type radio for the Repeat options. 
+	an input of type checkbox for the Shuffle button, and three inputs of type radio for the Repeat options.
 </p>
 </div>
 </body>
diff --git a/themes/base/jquery.ui.accordion.css b/themes/base/jquery.ui.accordion.css
index d239bc49e4d..8af1b2e2bbc 100644
--- a/themes/base/jquery.ui.accordion.css
+++ b/themes/base/jquery.ui.accordion.css
@@ -14,7 +14,7 @@
 	position: relative;
 	margin-top: 2px;
 	padding: .5em .5em .5em .7em;
-	zoom: 1;
+	min-height: 0; /* support: IE7 */
 }
 .ui-accordion .ui-accordion-icons {
 	padding-left: 2.2em;
@@ -35,5 +35,4 @@
 	padding: 1em 2.2em;
 	border-top: 0;
 	overflow: auto;
-	zoom: 1;
 }
diff --git a/themes/base/jquery.ui.button.css b/themes/base/jquery.ui.button.css
index 602f93a926e..bf6d10547b4 100644
--- a/themes/base/jquery.ui.button.css
+++ b/themes/base/jquery.ui.button.css
@@ -17,7 +17,6 @@
 	cursor: pointer;
 	vertical-align: middle;
 	text-align: center;
-	zoom: 1;
 	overflow: visible; /* removes extra width in IE */
 }
 .ui-button,
@@ -44,7 +43,7 @@ button.ui-button-icons-only {
 
 /* button text element */
 .ui-button .ui-button-text {
-	display: inline-block;
+	display: block;
 	line-height: normal;
 }
 .ui-button-text-only .ui-button-text {
diff --git a/themes/base/jquery.ui.core.css b/themes/base/jquery.ui.core.css
index c6880806541..cc1efef1d71 100644
--- a/themes/base/jquery.ui.core.css
+++ b/themes/base/jquery.ui.core.css
@@ -43,7 +43,7 @@
 	clear: both;
 }
 .ui-helper-clearfix {
-	zoom: 1;
+	min-height: 0; /* support: IE7 */
 }
 .ui-helper-zfix {
 	width: 100%;
diff --git a/themes/base/jquery.ui.dialog.css b/themes/base/jquery.ui.dialog.css
index d278d9649c6..986ce8604dd 100644
--- a/themes/base/jquery.ui.dialog.css
+++ b/themes/base/jquery.ui.dialog.css
@@ -40,7 +40,6 @@
 	padding: .5em 1em;
 	background: none;
 	overflow: auto;
-	zoom: 1;
 }
 .ui-dialog .ui-dialog-buttonpane {
 	text-align: left;
diff --git a/themes/base/jquery.ui.menu.css b/themes/base/jquery.ui.menu.css
index 9357158b7f2..67d5e6f82f5 100644
--- a/themes/base/jquery.ui.menu.css
+++ b/themes/base/jquery.ui.menu.css
@@ -22,7 +22,6 @@
 .ui-menu .ui-menu-item {
 	margin: 0;
 	padding: 0;
-	zoom: 1;
 	width: 100%;
 }
 .ui-menu .ui-menu-divider {
@@ -37,7 +36,7 @@
 	display: block;
 	padding: 2px .4em;
 	line-height: 1.5;
-	zoom: 1;
+	min-height: 0; /* support: IE7 */
 	font-weight: normal;
 }
 .ui-menu .ui-menu-item a.ui-state-focus,
diff --git a/themes/base/jquery.ui.tabs.css b/themes/base/jquery.ui.tabs.css
index f4d82f0380d..ec8a0539945 100644
--- a/themes/base/jquery.ui.tabs.css
+++ b/themes/base/jquery.ui.tabs.css
@@ -11,7 +11,6 @@
 .ui-tabs {
 	position: relative;/* position: relative prevents IE scroll bug (element with position: relative inside container with overflow: auto appear as "fixed") */
 	padding: .2em;
-	zoom: 1;
 }
 .ui-tabs .ui-tabs-nav {
 	margin: 0;
diff --git a/themes/base/jquery.ui.theme.css b/themes/base/jquery.ui.theme.css
index 6388885c23d..47aedb0d3ba 100644
--- a/themes/base/jquery.ui.theme.css
+++ b/themes/base/jquery.ui.theme.css
@@ -41,9 +41,10 @@
 	background: #cccccc/*{bgColorHeader}*/ url(images/ui-bg_highlight-soft_75_cccccc_1x100.png)/*{bgImgUrlHeader}*/ 50%/*{bgHeaderXPos}*/ 50%/*{bgHeaderYPos}*/ repeat-x/*{bgHeaderRepeat}*/;
 	color: #222222/*{fcHeader}*/;
 	font-weight: bold;
-	zoom: 1;
 }
-.ui-widget-header a { color: #222222/*{fcHeader}*/; }
+.ui-widget-header a {
+	color: #222222/*{fcHeader}*/;
+}
 
 /* Interaction states
 ----------------------------------*/
