diff --git a/includes/media.theme.inc b/includes/media.theme.inc
index 6913464..49e27d7 100644
--- a/includes/media.theme.inc
+++ b/includes/media.theme.inc
@@ -85,7 +85,7 @@ function template_preprocess_media_thumbnail(&$variables) {
  */
 function theme_media_formatter_large_icon($variables) {
   $file = $variables['file'];
-  $icon_dir = variable_get('media__icon_base_directory', file_default_scheme() . '://media-icons/') . '/' . media_variable_get('icon_set');
+  $icon_dir = variable_get('media__icon_base_directory', file_default_scheme() . '://media-icons/') . media_variable_get('icon_set');
   $icon = file_icon_path($file, $icon_dir);
   $variables['path'] = $icon;
 
diff --git a/media.install b/media.install
index 9415f06..8d1d98f 100644
--- a/media.install
+++ b/media.install
@@ -63,7 +63,7 @@ function media_install() {
  * Copy the media file icons to files directory for use with image styles.
  */
 function _media_install_copy_icons() {
-  $destination = variable_get('media__icon_base_directory', file_default_scheme() . '://media-icons/') . '/' . variable_get('media__icon_set', 'default');
+  $destination = variable_get('media__icon_base_directory', file_default_scheme() . '://media-icons/') . variable_get('media__icon_set', 'default');
   if (!file_prepare_directory($destination, FILE_CREATE_DIRECTORY)) {
     return FALSE;
   }