diff --git a/assets/stylesheets/alchemy.css b/assets/stylesheets/alchemy.css
diff --git a/assets/stylesheets/elements.css b/assets/stylesheets/elements.css
@@ -1,6 +1,5 @@
-/* @override http://localhost:3000/stylesheets/alchemy/elements.css */
-
 /* @override 
+	http://localhost:3000/stylesheets/alchemy/elements.css
 	http://0.0.0.0:3000/stylesheets/alchemy/elements.css
 	http://localhost:3000/stylesheets/alchemy/elements.css
 */
@@ -63,7 +62,7 @@ img.add_element_spinner {
 	position: absolute;
 	top: 0;
 	left: 0;
-	background: url(/images/alchemy/icons.png) no-repeat -112px -40px;
+	background: url(/images/alchemy/icons.png) no-repeat -224px -72px;
 }
 
 .element_handle span.icon {
@@ -74,7 +73,7 @@ img.add_element_spinner {
 }
 
 .element_handle span.icon.element_dirty {
-	background-position: -29px -104px;
+	background-position: -160px -166px;
 }
 
 div.element_foot span.element_public {
@@ -105,7 +104,7 @@ div.element_foot span.element_public {
 
 .add_content {
 	float: left;
-	margin: 3px;
+	margin: 1px;
 	width: 111px;
 	padding: 4px;
 	background-color: #f0e8d7;
@@ -129,7 +128,7 @@ div.element_foot span.element_public {
 }
 
 .add_content a .icon.assign {
-	background: url(/images/alchemy/icons.png) no-repeat -144px -40px;
+	background: url(/images/alchemy/icons.png) no-repeat -288px -72px;
 	position: absolute;
 	top: 52px;
 	left: 47px;
@@ -226,15 +225,15 @@ span.element_tools_icons {
 }
 
 a.delete_element_button {
-	background: url(/images/alchemy/icons.png) no-repeat -32px -40px;
+	background: url(/images/alchemy/icons.png) no-repeat -63px -72px;
 }
 
 a.element_copy_button {
-	background: url(/images/alchemy/icons.png) no-repeat -64px -40px;
+	background: url(/images/alchemy/icons.png) no-repeat -128px -72px;
 }
 
 a.element_move_button {
-	background: url(/images/alchemy/icons.png) no-repeat -48px -40px;
+	background: url(/images/alchemy/icons.png) no-repeat -97px -72px;
 }
 
 .element_head {
@@ -257,16 +256,14 @@ form.add_gallery_to_index {
 div.picture_gallery_images {
 	margin-top: 8px;
 	height: 100%;
-	padding-top: 1px;
-	padding-bottom: 2px;
 	overflow: hidden;
 	margin-bottom: 8px;
 	border: 1px inset #cecece;
-	padding-left: 2px;
 	-webkit-border-radius: 3px;
 	-moz-border-radius: 3px;
 	border-radius: 3px;
 	background-color: #e5dcca;
+	padding: 1px;
 }
 
 div.picture_thumbnail div.picture_image img.img_paddingtop {
@@ -352,7 +349,7 @@ div.content_editor a.icon_button.unlink {
 }
 
 a.expand_element {
-	background: url(/images/alchemy/icons.png) no-repeat -80px -40px;
+	background: url(/images/alchemy/icons.png) no-repeat -160px -72px;
 	height: 16px;
 	width: 16px;
 	text-decoration: none;
@@ -361,7 +358,7 @@ a.expand_element {
 }
 
 a.fold_element {
-	background: url(/images/alchemy/icons.png) no-repeat -96px -40px;
+	background: url(/images/alchemy/icons.png) no-repeat -192px -72px;
 	height: 16px;
 	width: 16px;
 	text-decoration: none;
@@ -800,7 +797,7 @@ textarea {
 	width: 111px;
 	height: 115px;
 	padding: 4px;
-	margin: 3px;
+	margin: 1px;
 }
 
 div.element_editor div.error {

diff --git a/config/locales/de.yml b/config/locales/de.yml
@@ -202,6 +202,8 @@ de:
       video/x-msvideo: 'AVI-Video'
       video/x-ms-wmv: 'Windows Media Video'
       image/tiff: 'TIFF-Bild'
+      'text/x-vcard': 'vCard'
+      application/vcard: 'vCard'
 
     link_target_options:
       default: gleichem Fenster

diff --git a/config/locales/en.yml b/config/locales/en.yml
@@ -188,6 +188,8 @@ en:
       image/jpeg: 'JPG-Image'
       video/x-msvideo: 'AVI-Video'
       image/tiff: 'TIFF-Image'
+      'text/x-vcard': 'vCard'
+      application/vcard: 'vCard'
 
     link_target_options:
       default: Same Window

diff --git a/spec/dummy/public/images/alchemy b/spec/dummy/public/images/alchemy
@@ -0,0 +1 @@
+../../../../assets/images
diff --git a/spec/dummy/public/images/alchemy/ajax_loader.gif b/spec/dummy/public/images/alchemy/ajax_loader.gif
diff --git a/spec/dummy/public/images/alchemy/alchemy-logo.png b/spec/dummy/public/images/alchemy/alchemy-logo.png
diff --git a/spec/dummy/public/images/alchemy/flags.png b/spec/dummy/public/images/alchemy/flags.png
diff --git a/spec/dummy/public/images/alchemy/gui/navi-tab.png b/spec/dummy/public/images/alchemy/gui/navi-tab.png
diff --git a/spec/dummy/public/images/alchemy/gui/shading.png b/spec/dummy/public/images/alchemy/gui/shading.png
diff --git a/spec/dummy/public/images/alchemy/gui/shading_90.png b/spec/dummy/public/images/alchemy/gui/shading_90.png
diff --git a/spec/dummy/public/images/alchemy/gui/toggle.png b/spec/dummy/public/images/alchemy/gui/toggle.png
diff --git a/spec/dummy/public/images/alchemy/icons.png b/spec/dummy/public/images/alchemy/icons.png
diff --git a/spec/dummy/public/images/alchemy/jquery-sb/select_arrow.gif b/spec/dummy/public/images/alchemy/jquery-sb/select_arrow.gif
diff --git a/spec/dummy/public/images/alchemy/jquery-sb/select_arrow_bg.gif b/spec/dummy/public/images/alchemy/jquery-sb/select_arrow_bg.gif
diff --git a/spec/dummy/public/images/alchemy/jquery-sb/select_arrow_bg_hover.gif b/spec/dummy/public/images/alchemy/jquery-sb/select_arrow_bg_hover.gif
diff --git a/spec/dummy/public/images/alchemy/jquery-ui/ui-icons_666666_256x240.png b/spec/dummy/public/images/alchemy/jquery-ui/ui-icons_666666_256x240.png
diff --git a/spec/dummy/public/images/alchemy/placeholder.png b/spec/dummy/public/images/alchemy/placeholder.png
diff --git a/spec/dummy/public/images/alchemy/swfupload/browse_button.png b/spec/dummy/public/images/alchemy/swfupload/browse_button.png
diff --git a/spec/dummy/public/javascripts/alchemy b/spec/dummy/public/javascripts/alchemy
@@ -0,0 +1 @@
+../../../../assets/javascripts/
diff --git a/spec/dummy/public/javascripts/alchemy/alchemy.element_editor_selector.js b/spec/dummy/public/javascripts/alchemy/alchemy.element_editor_selector.js
diff --git a/spec/dummy/public/javascripts/alchemy/alchemy.growler.js b/spec/dummy/public/javascripts/alchemy/alchemy.growler.js
diff --git a/spec/dummy/public/javascripts/alchemy/alchemy.image_cropper.js b/spec/dummy/public/javascripts/alchemy/alchemy.image_cropper.js
diff --git a/spec/dummy/public/javascripts/alchemy/alchemy.js b/spec/dummy/public/javascripts/alchemy/alchemy.js
diff --git a/spec/dummy/public/javascripts/alchemy/alchemy.link_overlay.js b/spec/dummy/public/javascripts/alchemy/alchemy.link_overlay.js
diff --git a/spec/dummy/public/javascripts/alchemy/alchemy.page_sorter.js b/spec/dummy/public/javascripts/alchemy/alchemy.page_sorter.js
diff --git a/spec/dummy/public/javascripts/alchemy/alchemy.preview.js b/spec/dummy/public/javascripts/alchemy/alchemy.preview.js
diff --git a/spec/dummy/public/javascripts/alchemy/jquery-ui.js b/spec/dummy/public/javascripts/alchemy/jquery-ui.js
diff --git a/spec/dummy/public/javascripts/alchemy/jquery.Jcrop.min.js b/spec/dummy/public/javascripts/alchemy/jquery.Jcrop.min.js
diff --git a/spec/dummy/public/javascripts/alchemy/jquery.dialogextend.min.js b/spec/dummy/public/javascripts/alchemy/jquery.dialogextend.min.js
diff --git a/spec/dummy/public/javascripts/alchemy/jquery.in-place-edit.js b/spec/dummy/public/javascripts/alchemy/jquery.in-place-edit.js
diff --git a/spec/dummy/public/javascripts/alchemy/jquery.js b/spec/dummy/public/javascripts/alchemy/jquery.js
diff --git a/spec/dummy/public/javascripts/alchemy/jquery.rails.js b/spec/dummy/public/javascripts/alchemy/jquery.rails.js
diff --git a/spec/dummy/public/javascripts/alchemy/jquery.sb.min.js b/spec/dummy/public/javascripts/alchemy/jquery.sb.min.js
diff --git a/spec/dummy/public/javascripts/alchemy/jquery.scrollTo-1.4.2-min.js b/spec/dummy/public/javascripts/alchemy/jquery.scrollTo-1.4.2-min.js
diff --git a/spec/dummy/public/javascripts/alchemy/jquery.ui.nestedSortable.js b/spec/dummy/public/javascripts/alchemy/jquery.ui.nestedSortable.js
diff --git a/spec/dummy/public/javascripts/alchemy/jquery.ui.tabspaging.js b/spec/dummy/public/javascripts/alchemy/jquery.ui.tabspaging.js
diff --git a/spec/dummy/public/javascripts/alchemy/swfupload/fileprogress.js b/spec/dummy/public/javascripts/alchemy/swfupload/fileprogress.js