diff --git a/modules/media_internet/media_internet.module b/modules/media_internet/media_internet.module
index 9a01e92..137264c 100644
--- a/modules/media_internet/media_internet.module
+++ b/modules/media_internet/media_internet.module
@@ -79,24 +79,30 @@ 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>');
+  $items = 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>';
+      $items[] = $provider['title'];
     }
   }
-  if (count($form['providers']) == 1) {
-    // Just the header, no actual providers
-    unset($form['providers']['header']);
+
+  if (!empty($items)) {
+    $form['providers'] = array();
+    $form['providers']['header'] = array(
+      '#markup' => '<h2>' . t('Supported Providers') . '</h2>',
+    );
+
+    $variables = array(
+      'items' => $items,
+      'title' => NULL,
+      'type' => 'ul',
+      'attributes' => array(),
+    );
+
+    $form['providers']['provider_list'] = array(
+      '#markup' => theme('item_list', $variables),
+    );
   }
 
   $form['actions'] = array('#type' => 'actions');