diff --git a/.htaccess b/.htaccess
index 09666c788..d963243ec 100644
--- a/.htaccess
+++ b/.htaccess
@@ -7,10 +7,14 @@ Options -Indexes
 	RewriteBase /
 	RewriteCond %{REQUEST_FILENAME} !-d
 	RewriteCond %{REQUEST_FILENAME} !-f
-	RewriteRule ^client/img/([a-zA-Z_]*)/([a-zA-Z_]*)/([a-zA-Z0-9_\.]*)$ server/php/image.php?size=$1&model=$2&filename=$3 [NC]
-	RewriteRule ^ical/([0-9]*)/([a-zA-Z0-9]*).ics$ server/php/ical.php?id=$1&hash=$2 [NC]
-	RewriteRule ^client/download/([0-9]*)/([a-zA-Z0-9_\.]*)$ server/php/download.php?id=$1&hash=$2 [NC]
-	RewriteRule ^client/oauth_callback/([a-zA-Z0-9_\.]*)/([a-zA-Z0-9_\.]*)$ server/php/oauth_callback.php?plugin=$1&code=$2 [NC]
-	RewriteRule ^oauth/authorize$ server/php/authorize.php [NC]
+	RewriteRule ^client/img/([a-zA-Z_]*)/([a-zA-Z_]*)/([a-zA-Z0-9_\.]*)$ server/php/image.php?size=$1&model=$2&filename=$3 [L]
+	RewriteRule ^ical/([0-9]*)/([a-zA-Z0-9]*).ics$ server/php/ical.php?id=$1&hash=$2 [L]
+	RewriteRule ^download/([0-9]*)/([a-zA-Z0-9_\.]*)$ server/php/download.php?id=$1&hash=$2 [L]
+	RewriteRule ^oauth_callback/([a-zA-Z0-9_\.]*)/([a-zA-Z0-9_\.]*)$ server/php/oauth_callback.php?plugin=$1&code=$2 [L]
+	RewriteRule ^oauth/authorize$ server/php/authorize.php [QSA,L]
 	RewriteRule ^api/(.*)$ server/php/R/r.php?_url=$1 [QSA,L]
+	RewriteRule ^$ client/ [QSA,L]
+	RewriteRule ^(css|js|img|font|apps|locales)/(.*)$ client/$1/$2 [QSA,L]
+	RewriteRule ^favicon.ico$ client/favicon.ico [L]
+	RewriteRule ^apple-touch-icon(.*)$ client/apple-touch-icon$1 [L]
 </IfModule>
\ No newline at end of file