diff --git a/theme/base/css/ie.css b/theme/base/css/ie.css
index 9dfb176698..a1144b489b 100644
--- a/theme/base/css/ie.css
+++ b/theme/base/css/ie.css
@@ -1,13 +1,19 @@
-/* Temporary copy of base styles for overriding */
+/* IE specific styles */
 
 input.checkbox,
 input.radio {
 top:0;
 }
+
 .form_notice textarea {
-    width: 485px;
+    width: 473px;
 }
-.form_notice .count + label {
+
+.threaded-replies .form_notice textarea {
+    width: 385px;
+}
+
+.form_notice .form_note + label {
 position:absolute;
 top:25px;
 left:83%;
@@ -15,25 +21,47 @@ text-indent:-9999px;
 height:16px;
 width:16px;
 display:block;
-    top: 30px;
+    left: 390px;
+    top: 27px;
 }
-.form_notice .submit {
+.form_notice #notice_action-submit {
     width: 106px;
     max-width: 106px;
 }
-.form_notice .attach-status,
-.form_notice #notice_data-geo_selected {
-width:78.75%;
+
+.form_notice .count {
+    right: 52px;
 }
-.form_notice .attach-status button,
-.form_notice #notice_data-geo_selected button {
-padding:0 4px;
+
+#form_notice-direct.form_notice .count {
+    right: 18px;
 }
+
+#form_notice-direct label {
+    float: left;
+}
+
+#form_notice-direct select {
+    margin-top: 0px;
+    float: left;
+}
+
+.form_notice .error,
+.form_notice .success,
+.form_notice .notice-status {
+    width: 468px; 
+}
+
+.threaded-replies .form_notice textarea {
+    width: 395px;
+}
+
 .notice-options input.submit {
 font-size:0;
 text-align:right;
 text-indent:0;
 }
+
 .notice div.entry-content .timestamp a {
 margin-right:4px;
 }
@@ -54,8 +82,14 @@ z-index:9999;
 line-height:auto;
 }
 
+#site_nav_global_primary ul {
+    margin-right: 0px;
+}
 
-/* IE specific styles */
+#site_nav_local_views ul {
+    list-style-type: none;
+    list-style-position: outside;
+}
 
 .notice-options input.submit {
     color:#FFFFFF;
@@ -65,16 +99,22 @@ line-height:auto;
     filter: alpha(opacity=0);
 }
 
-.form_notice .count + label {
-    background:transparent url(../images/icons/icons-01.gif) no-repeat 0 -328px;
+/* IE7 */ 
+
+*+html .input_forms {
+    margin-bottom: -20px;
 }
 
-.form_notice .notice_data-geo_wrap label {
-   background:transparent url(../images/icons/icons-01.gif) no-repeat 0 -1780px;
+/* IE6 */
+
+#content {
+    _width: 520px;
 }
 
-.form_notice .notice_data-geo_wrap label.checked {
-   background:transparent url(../images/icons/icons-01.gif) no-repeat 0 -1846px;
+#aside_primary {
+    _width: 190px;
 }
 
-
+#content h1 {
+    _clear: left;
+}
diff --git a/theme/neo/css/display.css b/theme/neo/css/display.css
index 2ab4b9158d..a0df1e9cb4 100644
--- a/theme/neo/css/display.css
+++ b/theme/neo/css/display.css
@@ -383,7 +383,7 @@ address {
 }
 
 #form_notice-direct.form_notice .count {
-    top: 80px;
+    top: 78px;
     right: 7px;
 }
 
@@ -450,6 +450,7 @@ address {
     text-align: left;
     color: #888;
     cursor: text;
+    background: #fff;
 }
 
 .input_form .form_settings li input {
@@ -786,6 +787,10 @@ div.entry-content a.response:after {
     font-size: 1em;
 }
 
+.threaded-replies:empty {
+    display: none;
+}
+
 .user_in .threaded-replies {
     margin-top: 0px;
 }
diff --git a/theme/neo/css/ie.css b/theme/neo/css/ie.css
deleted file mode 100644
index 9af3955301..0000000000
--- a/theme/neo/css/ie.css
+++ /dev/null
@@ -1,100 +0,0 @@
-/* Temporary copy of base styles for overriding */
-
-input.checkbox,
-input.radio {
-top:0;
-}
-.form_notice textarea {
-    width: 473px;
-}
-.threaded-replies .form_notice textarea {
-    width: 385px;
-}
-
-.form_notice .form_note + label {
-position:absolute;
-top:25px;
-left:83%;
-text-indent:-9999px;
-height:16px;
-width:16px;
-display:block;
-    left: 390px;
-    top: 27px;
-}
-.form_notice #notice_action-submit {
-    width: 106px;
-    max-width: 106px;
-}
-.form_notice input.notice_data-attach_selected,
-.form_notice #notice_data-geo_selected {
-width:78.75%;
-}
-.form_notice input.notice_data-attach_selected button,
-.form_notice #notice_data-geo_selected button {
-padding:0 4px;
-}
-.notice-options input.submit {
-font-size:0;
-text-align:right;
-text-indent:0;
-}
-.notice div.entry-content .timestamp a {
-margin-right:4px;
-}
-.entity_profile {
-width:64%;
-}
-.notice {
-z-index:1;
-}
-.notice:hover {
-z-index:9999;
-}
-.notice .thumbnail img {
-z-index:9999;
-}
-
-.form_settings fieldset fieldset legend {
-line-height:auto;
-}
-
-/* IE specific styles */
-
-#site_nav_global_primary ul {
-    margin-right: 0px;
-}
-
-#site_nav_local_views ul {
-    list-style-type: none;
-    list-style-position: outside;
-}
-
-.notice-options input.submit {
-    color:#FFFFFF;
-}
-
-.form_notice input.notice_data-attach {
-    filter: alpha(opacity=0);
-}
-
-.form_notice .form_note + label {
-    background:transparent url(../../rebase/images/icons/icons-01.gif) no-repeat 0 -328px;
-}
-
-.form_notice #notice_data-geo_wrap label {
-   background:transparent url(../../rebase/images/icons/icons-01.gif) no-repeat 0 -1780px;
-}
-.form_notice #notice_data-geo_wrap label.checked {
-   background:transparent url(../../rebase/images/icons/icons-01.gif) no-repeat 0 -1846px;
-}
-
-/* IE6 sucks */
-
-#content {
-    _width: 520px;
-}
-
-#aside_primary {
-    _width: 190px;
-}