diff --git a/compact_forms.admin.inc b/compact_forms.admin.inc
index 41f941d..ef15f18 100644
--- a/compact_forms.admin.inc
+++ b/compact_forms.admin.inc
@@ -17,6 +17,12 @@ function compact_forms_admin_form($form, &$form_state) {
     '#default_value' => variable_get('compact_forms_ids', 'user-login-form'),
     '#description' => t('Enter the CSS IDs of the forms to display compact. One per line.'),
   );
+  $form['compact_forms_select'] = array(
+    '#type' => 'checkbox',
+    '#title' => t('Compact select list elements'),
+    '#description' => t('Replaces default "Any" option with field label.'),
+    '#default_value' => variable_get('compact_forms_select', 1),
+  );
   $form['compact_forms_descriptions'] = array(
     '#type' => 'checkbox',
     '#title' => t('Hide field descriptions'),
diff --git a/compact_forms.module b/compact_forms.module
index 1a2e476..1d019c4 100644
--- a/compact_forms.module
+++ b/compact_forms.module
@@ -55,7 +55,33 @@ function compact_forms_form_alter(&$form, $form_state, $form_id) {
  * @todo Replace with #attached and move back into hook_form_alter().
  */
 function compact_forms_pre_render($form) {
-  static $css_ids, $form_ids, $loaded, $field_size, $descriptions;
+  static $loaded, $field_size, $descriptions;
+
+  if ($css_ids = compact_forms_check_form_id($form)) {
+    // Prepare form alteration settings.
+    if (!isset($field_size)) {
+      $field_size = variable_get('compact_forms_field_size', '');
+      $descriptions = variable_get('compact_forms_descriptions', 1);
+    }
+    // Load our page requisites and JavaScript settings.
+    if (!isset($loaded)) {
+      _compact_forms_include_js($css_ids);
+      $loaded = TRUE;
+    }
+    // Only alter the form if a custom field size is configured or form element
+    // descriptions shall be hidden.
+    if (!empty($field_size) || $descriptions) {
+      _compact_forms_resize_fields($form, $field_size, $descriptions);
+    }
+  }
+  return $form;
+}
+
+/**
+ * Check to see if the current form should be modified.
+ */
+function compact_forms_check_form_id($form) {
+  static $css_ids, $form_ids;
 
   // Prepare CSS form ids.
   if (!isset($css_ids)) {
@@ -69,11 +95,6 @@ function compact_forms_pre_render($form) {
       $form_ids[] = strtr($id, array('-' => '_'));
     }
   }
-  // Prepare form alteration settings.
-  if (!isset($field_size)) {
-    $field_size = variable_get('compact_forms_field_size', '');
-    $descriptions = variable_get('compact_forms_descriptions', 1);
-  }
 
   if (in_array($form['form_id']['#value'], $form_ids) || (isset($form['#id']) && in_array($form['#id'], $css_ids))) {
     // If the custom #compact_forms property has been programmatically set to
@@ -85,21 +106,11 @@ function compact_forms_pre_render($form) {
           unset($css_ids[$key]);
         }
       }
-      return;
-    }
-
-    // Load our page requisites and JavaScript settings.
-    if (!isset($loaded)) {
-      _compact_forms_include_js($css_ids);
-      $loaded = TRUE;
-    }
-    // Only alter the form if a custom field size is configured or form element
-    // descriptions shall be hidden.
-    if (!empty($field_size) || !$descriptions) {
-      _compact_forms_resize_fields($form, $field_size, $descriptions);
+      return FALSE;
     }
+    return $css_ids;
   }
-  return $form;
+  return FALSE;
 }
 
 /**
@@ -128,7 +139,7 @@ function _compact_forms_resize_fields(&$form, $field_size, $descriptions) {
         if (!empty($field_size)) {
           $form[$key]['#size'] = $field_size;
         }
-        if (!$descriptions) {
+        if ($descriptions) {
           unset($form[$key]['#description']);
         }
         break;
@@ -156,3 +167,60 @@ function _compact_forms_include_js($css_ids) {
   drupal_add_js($settings, 'setting');
 }
 
+/**
+ * Implements hook_field_attach_form()
+ *
+ * Replaces select list elements' #empty_option with element label.
+ */
+function compact_forms_field_attach_form($entity_type, $entity, &$form, &$form_state, $langcode) {
+  // @todo determine if this is a compact form!
+  if (variable_get('compact_forms_select', 1) && compact_forms_check_form_id($form)) {
+    foreach (element_children($form) as $name) {
+      if ($form[$name]['#type'] == 'container') {
+        // Determine form element language.
+        $language = $form[$name]['#language'];
+        // Replace empty option.
+        if ($form[$name][$language]['#type'] == 'select') {
+          $empty_option = $form[$name][$language]['#title'];
+          // If the element is required, append asterisk.
+          if ($form[$name][$language]['#required']) {
+            $empty_option .= ' *';
+          }
+          $form[$name][$language]['#options']['_none'] = $empty_option;
+          $form[$name][$language]['#attributes']['class'][] = 'compact-form-select';
+          unset($form[$name][$language]['#title']);
+        }
+      }
+    }
+  }
+}
+
+/**
+ * Implements hook_form_views_exposed_form_alter()
+ *
+ * Replaces select list elements' #empty_option with element label (views exposed filters).
+ */
+function compact_forms_form_views_exposed_form_alter(&$form, &$form_state, $form_id) {
+  if (variable_get('compact_forms_select', 1) && compact_forms_check_form_id($form)) {
+    foreach ($form['#info'] as $key => &$filter) {
+      $value = $filter['value'];
+      $type = isset($form[$value]['#type']) ? $form[$value]['#type']: NULL;
+      // Replace empty option for single select lists.
+      if ($type == 'select' && isset($filter['label'])) {
+        $form[$value]['#options']['All'] = $filter['label'];
+        $form[$value]['#attributes']['class'][] = 'compact-form-select';
+        unset($filter['label']);
+      }
+      // Replace empty option for fields with multiple select lists.
+      // E.g., date field with "to" and "from" elements.
+      elseif ($type == NULL) {
+        foreach ($form[$value] as $key => &$filter) {
+          $type = isset($filter['#type']) ? $filter['#type']: '';
+          $form[$filter['#title']]['#options']['All'] = $filter['#title'];
+          $form[$filter['#title']]['#attributes']['class'][] = 'compact-form-select';
+          unset($filter['#title']);
+        }
+      }
+    }
+  }
+}
\ No newline at end of file