diff --git a/widgets-rtl.css b/widgets-rtl.css
deleted file mode 100644
index 2a7a855..0000000
--- a/widgets-rtl.css
+++ /dev/null
@@ -1,11 +0,0 @@
-
-/**
- * Image upload widget.
- */
-div.image-preview {
-  float: right;
-  padding: 0 0 10px 10px;
-}
-div.image-widget-data {
-  float: right;
-}
diff --git a/widgets.css b/widgets.css
deleted file mode 100644
index f92b0e4..0000000
--- a/widgets.css
+++ /dev/null
@@ -1,11 +0,0 @@
-
-/**
- * Widgets styles.
- */
-div.widgets-element-horizontal {
-  float: left; /* LTR */
-}
-
-div.widgets-clear {
-  clear: both;
-}
\ No newline at end of file
diff --git a/widgets.module b/widgets.module
index 15797c0..a9858dd 100644
--- a/widgets.module
+++ b/widgets.module
@@ -1079,7 +1079,6 @@ function _widgets_cache_scope($name, $scope = NULL, $action = 'get') {
  * @ingroup themeable
  */
 function theme_widgets_set_view($variables) {
-  drupal_add_css(drupal_get_path('module', 'widgets') . '/widgets.css');
 
   $set = $variables['set'];
   $is_preview = widgets_is_preview();
@@ -1156,8 +1155,13 @@ function theme_widgets_set_view($variables) {
       		}
       	}
       	else {
-	        $pre = '<div id="widgets-element-' . $element['name'] . '" class="widgets widgets-element widgets-element-' . $style . ' widgets-style-' . $style . '">';
-	        $post = '</div>';          		
+          if($style == 'horizontal') {
+            $tag = 'span';
+          } else {
+            $tag = 'div';
+          }
+	        $pre = "<$tag id=\"widgets-element-" . $element['name'] . '" class="widgets widgets-element widgets-element-' . $style . ' widgets-style-' . $style . '">';
+	        $post = "</$tag>";          		
       	}   
       }
       $output .= $pre . $template . $post;
@@ -1202,10 +1206,7 @@ function theme_widgets_set_view($variables) {
     }
     else {
       $pre = '<div id="widgets-element-' . $set['name'] . '" class="widgets widgets-set widgets-set-' . $style . ' widgets-style-' . $style . '">';
-      $post = '</div>';  
-      if ($style == 'horizontal') {
-      	$post = '<div class="widgets-clear"></div>' . $post;
-      }
+      $post = '</div>';
     }      
   }
   $output = $set_pre . $pre . $output . $post . $set_post;