diff --git a/css/addons/bazarr/bazarr-4k-logo/bazarr-4k-logo.css b/css/addons/bazarr/bazarr-4k-logo/bazarr-4k-logo.css
index c8338ec0..44b35a2c 100644
--- a/css/addons/bazarr/bazarr-4k-logo/bazarr-4k-logo.css
+++ b/css/addons/bazarr/bazarr-4k-logo/bazarr-4k-logo.css
@@ -1,17 +1,5 @@
-    .bazarr-Avatar-root[class*="bazarr-"] img {
-        display: none !important;
-    }
-
-    .bazarr-Avatar-root[class*="bazarr-"]:before {
-        background-image: url("/css/addons/bazarr/bazarr-4k-logo/bazarr4k.png");
-        display: inline-block;
-        width: 32px;
-        height: 32px;
-        content: "";
-        background-size: cover;
-        -webkit-background-size: cover;
-        -moz-background-size: cover;
-        -o-background-size: cover;
+    [class*="bazarr-"].bazarr-Avatar-image {
+        content: url("/css/addons/bazarr/bazarr-4k-logo/bazarr4k.png");
     }
 
     #root>div>header>div>div.bazarr-Group-root[class*="bazarr-"]>div>span:after {
diff --git a/css/addons/radarr/radarr-4k-logo/radarr-4k-logo.css b/css/addons/radarr/radarr-4k-logo/radarr-4k-logo.css
index 0e7d257a..f5fd7643 100644
--- a/css/addons/radarr/radarr-4k-logo/radarr-4k-logo.css
+++ b/css/addons/radarr/radarr-4k-logo/radarr-4k-logo.css
@@ -1,96 +1,27 @@
-/* Desktop */
 @media (min-width: 752px) {
-    .navbar-brand>img {
-        display:none !important; 
-        }
-    .navbar > .container-fluid .navbar-brand:before {
-        background-image: url("/css/addons/radarr/radarr-4k-logo/radarr4k.png");
-        display: inline-block;
-        width: 128px; 
-        height: 128px;
-        content:"";
-        background-size:  cover;
-        -webkit-background-size:  cover;
-        -moz-background-size:  cover;
-        -o-background-size: cover;
-        }
-    }
-    /* Mobile */
-    @media (max-width: 767px) {
-    .navbar-brand  .visible-xs img {
-        display: none !important;
-        } 
-    .navbar-brand .visible-xs  {
-        display: inline !important;
-        }     
-    .navbar > .container-fluid .navbar-brand:before {
-        background-image: url("/css/addons/radarr/radarr-4k-logo/radarr4k.png");
-        display: inline-block;
-        width: 32px; 
-        height: 32px;
-        content:"";
-        background-size:  cover;
-        -webkit-background-size:  cover;
-        -moz-background-size:  cover;
-        -o-background-size: cover;
-        margin-bottom: -12px;
-        }
+    [class*="PageHeader-logoFull-"] {
+        content: url("/css/addons/radarr/radarr-4k-logo/radarr4k-v3.png");
+        margin-left: 15px;
+        width: 120px;
+        height: 40px;
     }
+}
 
-/* Radarr V3*/
-@media (min-width: 752px) {
-    [class*="PageHeader-logoFull-"]  {
-        display: none !important;
-    }
-    [class*="PageHeader-logoContainer-"]:before {
-        background-image: url("/css/addons/radarr/radarr-4k-logo/radarr4k-v3.png");
-        display: inline-block;
-        width: 148px; 
-        height: 48px;
-        content:"";
-        background-size:  cover;
-        -webkit-background-size:  cover;
-        -moz-background-size:  cover;
-        -o-background-size: cover;
-    }    
-} 
-
-@media (max-width: 767px) {
-    [class*="PageHeader-logo-"]  {
-        display: none !important;
-    }
-    [class*="PageHeader-logoContainer-"]{
-        background-image: url("/css/addons/radarr/radarr-4k-logo/radarr-v3-mobile.png");
-        display: inline-block;
-        width: 32px; 
+@media only screen and (max-width: 768px) {
+    [class*="PageHeader-logo-"] {
+        width: 32px;
         height: 32px;
-        content:"";
-        background-size:  cover;
-        -webkit-background-size:  cover;
-        -moz-background-size:  cover;
-        -o-background-size: cover;
-        margin-left: 20px;
-        margin-right: 8px;
-        flex: 0 0 32px;
-    } 
+        margin-left: 0px;
+        content: url("/css/addons/radarr/radarr-4k-logo/radarr-v3-mobile.png");
+    }
 }
 
 [class*="LoadingPage-logoFull-"] {
-    display: none !important;
-}
-
-[class*="LoadingPage-page-"]:before {
-        background-image: url("/css/addons/radarr/radarr-4k-logo/radarr4k-v3.png");
-        display: inline-block;
-        width: 148px; 
-        height: 48px;
-        content:"";
-        background-size:  cover;
-        -webkit-background-size:  cover;
-        -moz-background-size:  cover;
-        -o-background-size: cover;
-        margin-top: 50px;
-        margin-right: auto;
-        margin-left: auto;
-
-}
+    content: url("/css/addons/radarr/radarr-4k-logo/radarr4k-v3.png");
+    margin-top: 50px;
+    margin-right: auto;
+    margin-left: auto;
+    width: 120px;
+    height: 40px;
+    opacity: 1;
+}
\ No newline at end of file
diff --git a/css/addons/readarr/readarr-alt-logo/readarr-alt-logo.css b/css/addons/readarr/readarr-alt-logo/readarr-alt-logo.css
index f1f3b6fd..751c7d49 100644
--- a/css/addons/readarr/readarr-alt-logo/readarr-alt-logo.css
+++ b/css/addons/readarr/readarr-alt-logo/readarr-alt-logo.css
@@ -1,53 +1,16 @@
 @media (min-width: 752px) {
-    [class*="PageHeader-logo-"]  {
-        display: none !important;
+    [class*="PageHeader-logo-"] {
+        content: url("/css/addons/readarr/readarr-alt-logo/readarr_alt.png");
     }
-    [class*="PageHeader-logoContainer-"]:before {
-        background-image: url("/css/addons/readarr/readarr-alt-logo/readarr_alt.png");
-        display: inline-block;
-        width: 34px; 
-        height: 34px;
-        content:"";
-        background-size:  cover;
-        -webkit-background-size:  cover;
-        -moz-background-size:  cover;
-        -o-background-size: cover;
-    }    
-} 
+}
 
-@media (max-width: 767px) {
-    [class*="PageHeader-logo-"]   {
-        display: none !important;
-    }   
-    [class*="PageHeader-logoContainer-"]:before {
-        background-image: url("/css/addons/readarr/readarr-alt-logo/readarr_alt.png");
-        display: inline-block;
-        width: 34px; 
-        height: 34px;
-        content:"";
-        background-size:  cover;
-        -webkit-background-size:  cover;
-        -moz-background-size:  cover;
-        -o-background-size: cover;
-    } 
+@media only screen and (max-width: 768px) {
+    [class*="PageHeader-logo-"] {
+        content: url("/css/addons/readarr/readarr-alt-logo/readarr_alt.png");
+    }
 }
 
 [class*="LoadingPage-logoFull-"] {
-    display: none !important;
-}
-
-[class*="LoadingPage-page-"]:before {
-        background-image: url("/css/addons/readarr/readarr-alt-logo/readarr_alt.png");
-        display: inline-block;
-        width: 48px; 
-        height: 48px;
-        content:"";
-        background-size:  cover;
-        -webkit-background-size:  cover;
-        -moz-background-size:  cover;
-        -o-background-size: cover;
-        margin-top: 50px;
-        margin-right: auto;
-        margin-left: auto;
-
-}
+    content: url("/css/addons/readarr/readarr-alt-logo/readarr_alt.png");
+    opacity: 1;
+}
\ No newline at end of file
diff --git a/css/addons/sonarr/sonarr-4k-logo/sonarr-4k-logo.css b/css/addons/sonarr/sonarr-4k-logo/sonarr-4k-logo.css
index 0b109c74..9bcc5ab7 100644
--- a/css/addons/sonarr/sonarr-4k-logo/sonarr-4k-logo.css
+++ b/css/addons/sonarr/sonarr-4k-logo/sonarr-4k-logo.css
@@ -1,53 +1,16 @@
 @media (min-width: 752px) {
-    [class*="PageHeader-logo-"]  {
-        display: none !important;
+    [class*="PageHeader-logo-"] {
+        content: url("/css/addons/sonarr/sonarr-4k-logo/sonarr-4k.png");
     }
-    [class*="PageHeader-logoContainer-"]:before {
-        background-image: url("/css/addons/sonarr/sonarr-4k-logo/sonarr-4k.png");
-        display: inline-block;
-        width: 32px; 
-        height: 32px;
-        content:"";
-        background-size:  cover;
-        -webkit-background-size:  cover;
-        -moz-background-size:  cover;
-        -o-background-size: cover;
-    }    
-} 
+}
 
-@media (max-width: 767px) {
-    [class*="PageHeader-logo-"]   {
-        display: none !important;
-    }   
-    [class*="PageHeader-logoContainer-"]:before {
-        background-image: url("/css/addons/sonarr/sonarr-4k-logo/sonarr-4k.png");
-        display: inline-block;
-        width: 32px; 
-        height: 32px;
-        content:"";
-        background-size:  cover;
-        -webkit-background-size:  cover;
-        -moz-background-size:  cover;
-        -o-background-size: cover;
-    } 
+@media only screen and (max-width: 768px) {
+    [class*="PageHeader-logo-"] {
+        content: url("/css/addons/sonarr/sonarr-4k-logo/sonarr-4k.png");
+    }
 }
 
 [class*="LoadingPage-logoFull-"] {
-    display: none !important;
-}
-
-[class*="LoadingPage-page-"]:before {
-        background-image: url("/css/addons/sonarr/sonarr-4k-logo/sonarr-4k.png");
-        display: inline-block;
-        width: 48px; 
-        height: 48px;
-        content:"";
-        background-size:  cover;
-        -webkit-background-size:  cover;
-        -moz-background-size:  cover;
-        -o-background-size: cover;
-        margin-top: 50px;
-        margin-right: auto;
-        margin-left: auto;
-
-}
+    content: url("/css/addons/sonarr/sonarr-4k-logo/sonarr-4k.png");
+    opacity: 1;
+}
\ No newline at end of file
diff --git a/css/addons/sonarr/sonarr-4k-text-logo/sonarr-4k-text-logo.css b/css/addons/sonarr/sonarr-4k-text-logo/sonarr-4k-text-logo.css
index 9dc5b903..0805aae0 100644
--- a/css/addons/sonarr/sonarr-4k-text-logo/sonarr-4k-text-logo.css
+++ b/css/addons/sonarr/sonarr-4k-text-logo/sonarr-4k-text-logo.css
@@ -1,55 +1,27 @@
 @media (min-width: 752px) {
-    [class*="PageHeader-logo-"]  {
-        display: none !important;
-    }
-    [class*="PageHeader-logoContainer-"]:before {
-        background-image: url("/css/addons/sonarr/sonarr-4k-text-logo/sonarr-4k-text.png");
-        display: inline-block;
-		margin-left: 15px;
-        width: 124px; 
+    [class*="PageHeader-logo-"] {
+        content: url("/css/addons/sonarr/sonarr-4k-text-logo/sonarr-4k-text.png");
+        margin-left: 15px;
+        width: 120px;
         height: 40px;
-        content:"";
-        background-size:  cover;
-        -webkit-background-size:  cover;
-        -moz-background-size:  cover;
-        -o-background-size: cover;
-    }    
-} 
+    }
+}
 
+@media only screen and (max-width: 768px) {
+    [class*="PageHeader-logo-"] {
+        width: 32px;
+        height: 32px;
+        margin-left: 0px;
+        content: url("/css/addons/sonarr/sonarr-4k-logo/sonarr-4k.png");
+    }
+}
 
 [class*="LoadingPage-logoFull-"] {
-    display: none !important;
-}
-
-[class*="LoadingPage-page-"]:before {
-        background-image: url("/css/addons/sonarr/sonarr-4k-text-logo/sonarr-4k-text.png");
-        display: inline-block;
-        width: 124px; 
-        height: 40px;
-        content:"";
-        background-size:  cover;
-        -webkit-background-size:  cover;
-        -moz-background-size:  cover;
-        -o-background-size: cover;
-        margin-top: 50px;
-        margin-right: auto;
-        margin-left: auto;
-
-}
-
-@media (max-width: 767px) {
-    [class*="PageHeader-logo-"]   {
-        display: none !important;
-    }   
-    [class*="PageHeader-logoContainer-"]:before {
-        background-image: url("/css/addons/sonarr/sonarr-4k-logo/sonarr-4k.png");
-        display: inline-block;
-        width: 32px; 
-        height: 32px;
-        content:"";
-        background-size:  cover;
-        -webkit-background-size:  cover;
-        -moz-background-size:  cover;
-        -o-background-size: cover;
-    } 
-}
+    content: url("/css/addons/sonarr/sonarr-4k-text-logo/sonarr-4k-text.png");
+    margin-top: 50px;
+    margin-right: auto;
+    margin-left: auto;
+    width: 120px;
+    height: 40px;
+    opacity: 1;
+}
\ No newline at end of file
diff --git a/css/addons/sonarr/sonarr-text-logo/sonarr-text-logo.css b/css/addons/sonarr/sonarr-text-logo/sonarr-text-logo.css
index 0979cbe5..b037386c 100644
--- a/css/addons/sonarr/sonarr-text-logo/sonarr-text-logo.css
+++ b/css/addons/sonarr/sonarr-text-logo/sonarr-text-logo.css
@@ -1,38 +1,27 @@
 @media (min-width: 752px) {
-    [class*="PageHeader-logo-"]  {
-        display: none !important;
-    }
-    [class*="PageHeader-logoContainer-"]:before {
-        background-image: url("/css/addons/sonarr/sonarr-text-logo/sonarr-text.png");
-        display: inline-block;
-		margin-left: 15px;
-        width: 124px; 
+    [class*="PageHeader-logo-"] {
+        content: url("/css/addons/sonarr/sonarr-text-logo/sonarr-text.png");
+        margin-left: 15px;
+        width: 120px;
         height: 40px;
-        content:"";
-        background-size:  cover;
-        -webkit-background-size:  cover;
-        -moz-background-size:  cover;
-        -o-background-size: cover;
-    }    
-} 
+    }
+}
 
+@media only screen and (max-width: 768px) {
+    [class*="PageHeader-logo-"] {
+        width: 32px;
+        height: 32px;
+        margin-left: 0px;
+        content: url("sonarr/Content/Images/logo.svg");
+    }
+}
 
 [class*="LoadingPage-logoFull-"] {
-    display: none !important;
-}
-
-[class*="LoadingPage-page-"]:before {
-        background-image: url("/css/addons/sonarr/sonarr-text-logo/sonarr-text.png");
-        display: inline-block;
-        width: 124px; 
-        height: 40px;
-        content:"";
-        background-size:  cover;
-        -webkit-background-size:  cover;
-        -moz-background-size:  cover;
-        -o-background-size: cover;
-        margin-top: 50px;
-        margin-right: auto;
-        margin-left: auto;
-
-}
+    content: url("/css/addons/sonarr/sonarr-text-logo/sonarr-text.png");
+    margin-top: 50px;
+    margin-right: auto;
+    margin-left: auto;
+    width: 120px;
+    height: 40px;
+    opacity: 1;
+}
\ No newline at end of file
diff --git a/docker-mods/qbittorrent/root/etc/cont-init.d/98-themepark b/docker-mods/qbittorrent/root/etc/cont-init.d/98-themepark
index e7a8df69..dc6916b5 100755
--- a/docker-mods/qbittorrent/root/etc/cont-init.d/98-themepark
+++ b/docker-mods/qbittorrent/root/etc/cont-init.d/98-themepark
@@ -30,9 +30,11 @@ echo '--------------------------'
     if [ -x "$(command -v apk)" ]; then 
       apk update && \
       apk add --no-cache subversion
+      apk add --no-cache perl
     elif [ -x "$(command -v apt-get)" ]; then
       apt-get update && \
       apt-get install -y subversion
+      apt-get install -y perl
     fi
 fi
 
@@ -95,21 +97,35 @@ sed_file(){
     printf 'Stylesheet set to %s on %s\n\n' "${TP_THEME}" "$1"
 }
 
-# Adding stylesheets
-echo '---------------------------------------'
-echo '| Adding the stylesheet to html files |'
-echo '---------------------------------------'
-if ! grep -q "${TP_DOMAIN}/css/base" /themepark/public/index.html; then
-    sed_file /themepark/public/index.html
-fi
+clean_file() {
+    perl -i -pe 's/QBT_TR?\(//' "$1"
+    perl -i -pe 's/\)QBT_TR\[CONTEXT=.*?\]//' "$1"
+}
 
-if ! grep -q "${TP_DOMAIN}/css/base" /themepark/private/index.html; then
-    find /themepark/private -type f -iname *.html | while read fname
+if ! grep -q "${TP_DOMAIN}/css/base" /themepark/public/index.html; then
+    # Adding stylesheets
+    echo '---------------------------------------'
+    echo '| Adding the stylesheet to html files |'
+    echo '---------------------------------------'
+    sed_file /themepark/public/index.html
+    clean_file /themepark/public/index.html
+
+    find /themepark/private -type f -iname "*.html" | while read fname
     do
         sed_file $fname
     done
 fi
 
+# Clean all files
+printf 'Cleaning files in /themepark for any translation text...\n\n
+--------------------------------------------------------------------------
+| !!! RESTART THE CONTAINER IF THIS IS THE FIRST TIME CLEANING FILES !!! |
+--------------------------------------------------------------------------\n\n'
+find /themepark -type f \( ! -iname "*.svg" \) | while read fname
+do
+    clean_file $fname
+done
+
 if ! grep -q "WebUI\\\RootFolder" "${APP_FILEPATH}"; then
     echo '--------------------------------------'
     echo '| Adding WebUI\RootFolder=/themepark |'
diff --git a/docker-mods/qbittorrent/root/etc/s6-overlay/s6-rc.d/init-mod-themepark-add-package/run b/docker-mods/qbittorrent/root/etc/s6-overlay/s6-rc.d/init-mod-themepark-add-package/run
index 5c18c377..08e75e25 100755
--- a/docker-mods/qbittorrent/root/etc/s6-overlay/s6-rc.d/init-mod-themepark-add-package/run
+++ b/docker-mods/qbittorrent/root/etc/s6-overlay/s6-rc.d/init-mod-themepark-add-package/run
@@ -2,4 +2,5 @@
 
 if ! [[ -x "$(command -v svn)" ]]; then
     echo "subversion" >> /mod-repo-packages-to-install.list
+    echo "perl" >> /mod-repo-packages-to-install.list
 fi
diff --git a/docker-mods/qbittorrent/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run b/docker-mods/qbittorrent/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run
index 76305fd5..0d884081 100755
--- a/docker-mods/qbittorrent/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run
+++ b/docker-mods/qbittorrent/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run
@@ -82,21 +82,35 @@ sed_file(){
     printf 'Stylesheet set to %s on %s\n\n' "${TP_THEME}" "$1"
 }
 
-# Adding stylesheets
-echo '---------------------------------------'
-echo '| Adding the stylesheet to html files |'
-echo '---------------------------------------'
-if ! grep -q "${TP_DOMAIN}/css/base" /themepark/public/index.html; then
-    sed_file /themepark/public/index.html
-fi
+clean_file() {
+    perl -i -pe 's/QBT_TR?\(//' "$1"
+    perl -i -pe 's/\)QBT_TR\[CONTEXT=.*?\]//' "$1"
+}
 
-if ! grep -q "${TP_DOMAIN}/css/base" /themepark/private/index.html; then
-    find /themepark/private -type f -iname *.html | while read fname
+if ! grep -q "${TP_DOMAIN}/css/base" /themepark/public/index.html; then
+    # Adding stylesheets
+    echo '---------------------------------------'
+    echo '| Adding the stylesheet to html files |'
+    echo '---------------------------------------'
+    sed_file /themepark/public/index.html
+    clean_file /themepark/public/index.html
+
+    find /themepark/private -type f -iname "*.html" | while read fname
     do
         sed_file $fname
     done
 fi
 
+# Clean all files
+printf 'Cleaning files in /themepark for any translation text...\n\n
+--------------------------------------------------------------------------
+| !!! RESTART THE CONTAINER IF THIS IS THE FIRST TIME CLEANING FILES !!! |
+--------------------------------------------------------------------------\n\n'
+find /themepark -type f \( ! -iname "*.svg" \) | while read fname
+do
+    clean_file $fname
+done
+
 if ! grep -q "WebUI\\\RootFolder" "${APP_FILEPATH}"; then
     echo '--------------------------------------'
     echo '| Adding WebUI\RootFolder=/themepark |'