diff --git a/field-collection-item.tpl.php b/field-collection-item.tpl.php
index b14dd95..d608fed 100644
--- a/field-collection-item.tpl.php
+++ b/field-collection-item.tpl.php
@@ -28,7 +28,7 @@
  * @see template_process()
  */
 ?>
-<div class="<?php print $classes; ?> clearfix"<?php print $attributes; ?>>
+<div class="<?php print $classes; ?>"<?php print $attributes; ?>>
   <div class="content"<?php print $content_attributes; ?>>
     <?php
       print render($content);
diff --git a/field_collection.module b/field_collection.module
index cf2bf30..7d07f49 100644
--- a/field_collection.module
+++ b/field_collection.module
@@ -743,17 +743,17 @@ function field_collection_field_formatter_view($entity_type, $entity, $field, $i
 
     case 'field_collection_view':
 
-      $element['#attached']['css'][] = drupal_get_path('module', 'field_collection') . '/field_collection.theme.css';
       foreach ($items as $delta => $item) {
         if ($field_collection = field_collection_field_get_entity($item)) {
           $element[$delta]['entity'] = $field_collection->view();
           $element[$delta]['#theme_wrappers'] = array('field_collection_view');
           $element[$delta]['#attributes']['class'][] = 'field-collection-view';
-          $element[$delta]['#attributes']['class'][] = 'clearfix';
 
           $links = array(
             '#theme' => 'links__field_collection_view',
           );
+          $links['#attributes']['class'][] = 'links';
+          $links['#attributes']['class'][] = 'inline';
           $links['#attributes']['class'][] = 'field-collection-view-links';
           foreach (array('edit', 'delete') as $op) {
             if ($settings[$op] && field_collection_item_access($op == 'edit' ? 'update' : $op, $field_collection)) {
@@ -803,7 +803,7 @@ function field_collection_field_formatter_links(&$element, $entity_type, $entity
   }
 
   $element += array('#prefix' => '', '#suffix' => '');
-  $element['#prefix'] .= '<div class="field-collection-container clearfix">';
+  $element['#prefix'] .= '<div class="field-collection-container">';
   $element['#suffix'] .= '</div>';
 
   return $element;
diff --git a/field_collection.theme.css b/field_collection.theme.css
deleted file mode 100644
index b619185..0000000
--- a/field_collection.theme.css
+++ /dev/null
@@ -1,66 +0,0 @@
-@CHARSET "UTF-8";
-
-.field-collection-container {
-  border-bottom: 1px solid #D3D7D9;
-  margin-bottom: 1em;
-}
-
-.field-collection-container .field-items .field-item {
-  margin-bottom: 10px;
-}
-
-.field-collection-container .field-items .field-items .field-item {
-  margin-bottom: 0;
-}
-
-.field-collection-view {
-  padding: 1em 0 0.3em 0;
-  margin: 0 1em 0 1em;
-  border-bottom: 1px dotted #D3D7D9;
-}
-
-/* If there is no add link, don't show the final border. */
-.field-collection-view-final {
-  border-bottom: none;
-}
-
-.field-collection-view .entity-field-collection-item {
-  float: left;
-}
-
-.field-collection-view ul.field-collection-view-links {
-  float: right;
-  font-size: 0.821em;
-  list-style-type: none;
-  width: auto;
-  margin: 0 1em;
-  padding: 0;
-}
-
-.field-collection-view .field-label {
-  width: 25%;
-}
-
-.field-collection-view .content {
-  margin-top: 0;
-  width: 100%;
-}
-
-.field-collection-view .entity-field-collection-item {
-  width: 100%;
-}
-
-ul.field-collection-view-links li {
-  float: left;
-}
-
-ul.field-collection-view-links li a {
-  margin-right: 1em;
-}
-
-.field-collection-container ul.action-links-field-collection-add {
-  float: right;
-  padding: 0 0.5em 0 0;
-  margin: 0 0 1em 2em;
-  font-size: 0.821em;
-}