diff --git a/plugins/views_plugin_style.inc b/plugins/views_plugin_style.inc
index d355e1b..91c89cb 100644
--- a/plugins/views_plugin_style.inc
+++ b/plugins/views_plugin_style.inc
@@ -122,16 +122,24 @@ class views_plugin_style extends views_plugin {
    */
   function get_row_class($row_index) {
     if ($this->uses_row_class()) {
-      $class = $this->options['row_class'];
-      if ($this->uses_fields() && $this->view->field) {
-        $class = strip_tags($this->tokenize_value($class, $row_index));
-      }
-
-      $classes = explode(' ', $class);
-      foreach ($classes as &$class) {
-        $class = drupal_clean_css_identifier($class);
+      if ($values = explode(' ', $this->options['row_class'])){
+        $classes = array();
+        if ($this->uses_fields() && $this->view->field) {
+          foreach ($values as $value) {
+            if ($class = strip_tags($this->tokenize_value($value, $row_index))) {
+              $classes[] = drupal_html_class(trim($class));
+            }
+          }
+        }else{
+          foreach ($values as $class) {
+            $classes[] = drupal_html_class(trim($class));
+          }
+        }
+        if(module_exists('transliteration')){
+          $classes = array_map('transliteration_get', $classes);
+        }
+        return implode(' ', $classes);
       }
-      return implode(' ', $classes);
     }
   }
 
diff --git a/tests/styles/views_plugin_style.test b/tests/styles/views_plugin_style.test
index dfc5413..0cc6fc3 100644
--- a/tests/styles/views_plugin_style.test
+++ b/tests/styles/views_plugin_style.test
@@ -252,11 +252,11 @@ class ViewsPluginStyleTestCase extends ViewsPluginStyleTestBase {
     foreach ($rows as $row) {
       $attributes = $row->attributes();
       $class = (string) $attributes['class'][0];
-      $this->assertTrue(strpos($class, $random_name) !== FALSE, 'Take sure that a custom css class is added to the output.');
+      $this->assertTrue(strpos($class, drupal_html_class($random_name)) !== FALSE, 'Take sure that a custom css class is added to the output.');
 
       // Check token replacement.
       $name = $view->field['name']->get_value($view->result[$count]);
-      $this->assertTrue(strpos($class, "test-token-$name") !== FALSE, 'Take sure that a token in custom css class is replaced.');
+      $this->assertTrue(strpos($class, drupal_html_class("test-token-$name")) !== FALSE, 'Take sure that a token in custom css class is replaced.');
 
       $count++;
     }