diff --git a/CRM/Admin/Form/Setting/Url.php b/CRM/Admin/Form/Setting/Url.php
index dbd4f2035eaeca3f7ab6bfde4d19a4868e4b99ab..5ac5fffd82591a9a4b9b6bcab7326a782dfe84c6 100644
--- a/CRM/Admin/Form/Setting/Url.php
+++ b/CRM/Admin/Form/Setting/Url.php
@@ -40,6 +40,7 @@
 class CRM_Admin_Form_Setting_Url extends CRM_Admin_Form_Setting {
   protected $_settings = array(
     'cvv_backoffice_required' => CRM_Core_BAO_Setting::CONTRIBUTE_PREFERENCES_NAME,
+    'disable_core_css' => CRM_Core_BAO_Setting::URL_PREFERENCES_NAME,
   );
   /**
    * Function to build the form
diff --git a/CRM/Core/Resources.php b/CRM/Core/Resources.php
index d2e79f229eb4cb5824ec91efbafdeefa62cbc26a..af15e33c0d8624749fe7055dbb08f2e45f0d3172 100644
--- a/CRM/Core/Resources.php
+++ b/CRM/Core/Resources.php
@@ -493,8 +493,9 @@ class CRM_Core_Resources {
       if (!empty($config->customCSSURL)) {
         $this->addStyleUrl($config->customCSSURL, -99, $region);
       }
-      else {
+      if (!CRM_Core_BAO_Setting::getItem(CRM_Core_BAO_Setting::URL_PREFERENCES_NAME, 'disable_core_css')) {
         $this->addStyleFile('civicrm', 'css/civicrm.css', -99, $region);
+        // extras.css is deprecated. Don't use it.
         $this->addStyleFile('civicrm', 'css/extras.css', -98, $region);
       }
     }
diff --git a/css/extras.css b/css/extras.css
index 248387ddd9c83a15117cfbf377b0ee0505f82ec8..72a92580c3ec81109cc5b45b4a7ff83ef4346169 100644
--- a/css/extras.css
+++ b/css/extras.css
@@ -1,7 +1,5 @@
-/* $Id$ */
-
-/*
-** Put your local CSS modifications in this file
-** if you don't want to modify system provided
-** civicrm.css.
-*/
+/**
+ * @deprecated
+ * This file is deprecated and support will be removed for it in version 4.5
+ * Don't use it. Instead configure a custom css url at /civicrm/admin/setting/url?reset=1
+ */
diff --git a/settings/Url.setting.php b/settings/Url.setting.php
index 46decc3bab2f9cd42b5310646c8494d2f1b105ad..f1faea09467e20053a70d5282ab2835ab7141050 100644
--- a/settings/Url.setting.php
+++ b/settings/Url.setting.php
@@ -78,6 +78,19 @@ return array (
     'help_text' => null,
     'validate_callback' => 'CRM_Utils_Rule::url',
   ),
+  'disable_core_css' => array(
+    'group' => 'UrlPreferences',
+    'group_name' => 'url',
+    'name' => 'disableCoreCSS',
+    'type' => 'Boolean',
+    'quick_form_type' => 'YesNo',
+    'default' => '0',
+    'add' => '4.4',
+    'title' => 'Disable CiviCRM css',
+    'is_domain' => 1,
+    'is_contact' => 0,
+    'description' => 'If you enable this option, the stylesheet "civicrm.css" will not be loaded. You will have to provide your own css to theme CiviCRM',
+    'help_text' => NULL,
+  ),
 
-
-  );
+);
diff --git a/templates/CRM/Admin/Form/Setting/Url.tpl b/templates/CRM/Admin/Form/Setting/Url.tpl
index 3f8a81c46567b270124fb0fa0dc7357d537f8464..1ab579b4423794acb717e7ad2ef0f8d914748e8b 100644
--- a/templates/CRM/Admin/Form/Setting/Url.tpl
+++ b/templates/CRM/Admin/Form/Setting/Url.tpl
@@ -53,6 +53,15 @@
             {$form.customCSSURL.html|crmAddClass:'huge40'} {help id='id-css_url'}
         </td>
     </tr>
+    <tr class="crm-url-form-block-disable_core_css">
+        <td class="label">
+            {$form.disable_core_css.label}
+        </td>
+        <td>
+            {$form.disable_core_css.html}<br />
+            <p class="description">{ts}{$disable_core_css_description}{/ts}</p>
+        </td>
+    </tr>
     <tr class="crm-url-form-block-extensionsURL">
         <td class="label">
             {$form.extensionsURL.label}