diff --git a/location.module b/location.module
index 137415a..e07c6e5 100644
--- a/location.module
+++ b/location.module
@@ -511,6 +511,9 @@ function theme_location_geocoding_options(&$form) {
   return $output;
 }
 
+function theme_location_input(&$element) {
+  return '<div class="location-input">' . theme('fieldset', $element) . '</div>';
+}
 
 function location_form_alter($form_id, &$form) {
   if ($form_id == 'node_type_form') {
@@ -689,7 +692,7 @@ function location_form_alter($form_id, &$form) {
       $form['locations'][$index] = array_merge(
         is_array($form['locations'][$index]) ? $form['locations'][$index] : array(),
         array(
-          '#type' => 'fieldset',
+          '#type' => 'location_input',
           '#title' => t('Location #%number', array('%number' => $index + 1)),
           '#tree' => TRUE,
           '#attributes' => array('class' => 'location')
@@ -1115,7 +1118,7 @@ function location_extra_form(&$node) {
   $suppressed_values = variable_get('location_suppress_country', 0) ? array('country' => variable_get('location_default_country', 'us')) : array();
   
   $form['location'] = array(
-    '#type' => 'fieldset',
+    '#type' => 'location_input',
     '#title' => t('Add another location'),
     '#tree' => TRUE,
     '#attributes' => array('class' => 'location'),
@@ -1428,7 +1431,7 @@ function location_user($op, &$edit, &$user, $category = NULL) {
   if ($op == 'form' && $category == 'account' && $user_setting == LOCATION_USER_COLLECT) {
     $form = array(1 => array());
     $form[0]['location'] = location_form(array('street', 'city', 'province', 'postal_code', 'country'), (isset($user->location) && !_location_is_empty($user->location)) ? location_api2form($user->location) : array('country' => variable_get('location_default_country', 'us')), array(), variable_get('location_suppress_country', 0) ? array('country' => variable_get('location_default_country', 'us')) : array());
-    $form[0]['location']['#type'] = 'fieldset';
+    $form[0]['location']['#type'] = 'location_input';
     $form[0]['location']['#title'] = t('Location');
     $form[0]['location']['#tree'] = TRUE;
     $form[0]['location']['#collapsible'] = TRUE;