diff --git a/css/media.css b/css/media.css
index acd1ebf..9a12cda 100644
--- a/css/media.css
+++ b/css/media.css
@@ -234,11 +234,6 @@ div#media-browser .throbber {
   overflow-y: auto;
 }
 
-#media-tab-media_internet .media-provider img {
-  vertical-align: middle;
-  margin-right: 1em;
-}
-
 #media-browser-library-list .label-wrapper {
   margin-left: 0;
 }
diff --git a/modules/media_internet/media_internet.module b/modules/media_internet/media_internet.module
index 9a01e92..2b7baf4 100644
--- a/modules/media_internet/media_internet.module
+++ b/modules/media_internet/media_internet.module
@@ -79,25 +79,21 @@ function media_internet_add($form, &$form_state = array(), $types = NULL) {
     $form['#validators']['media_file_validate_types'] = array($types);
   }
 
-  $form['providers'] = array();
-  $form['providers']['header'] = array('#markup' => '<h2>' . t('Supported Providers') . '</h2>');
+  $providers = array();
   foreach (media_internet_get_providers() as $key => $provider) {
     if (empty($provider['hidden']) || $provider['hidden'] != TRUE) {
-      if (isset($provider['image'])) {
-        $form['providers'][$key] = array('#markup' => theme('image', array('path' => $provider['image'], 'title' => $provider['title'])));
-      }
-      else {
-        $form['providers'][$key] = array('#markup' => $provider['title']);
-      }
-      // Wrap the provider in a div so we can make a nice list
-      $form['providers'][$key]['#prefix'] = '<div class="media-provider">';
-      $form['providers'][$key]['#suffix'] = '</div>';
+      // @todo Convert this to show provider images in a nice format.
+      $providers[$key] = check_plain($provider['title']);
     }
   }
-  if (count($form['providers']) == 1) {
-    // Just the header, no actual providers
-    unset($form['providers']['header']);
-  }
+  $form['proviers'] = array(
+    '#theme' => 'item_list',
+    '#title' => t('Supported providers'),
+    '#items' => $providers,
+    '#attributes' => array(
+      'class' => array('media-internet-providers'),
+    ),
+  );
 
   $form['actions'] = array('#type' => 'actions');
   $form['actions']['submit'] = array(