From df31fc77e311c6266401b6ddd1ca190ac1f68b2b Mon Sep 17 00:00:00 2001
From: Timo Pollmeier <timo.pollmeier@greenbone.net>
Date: Fri, 10 Nov 2023 09:13:26 +0100
Subject: [PATCH] Fix: Fix invalid DOM props and other minor JS console errors

This fixes various minor errors that do not visibly affect the
content visible to users but appear in the JS console.

This includes:
- internal props are no longer passed to the DOM
- invalid prop types are fixed
- better handling of models and missing data
- tr elements are nested in the correct parent elements
- keys in reference lists are made unique
- correct functions are defined for gmp mock in tests

Fixing these errors makes it easier to spot errors that do have
an effect on the visible content.
---
 src/gmp/model.js                              |  6 ++
 src/gmp/models/cve.js                         | 10 +-
 src/gmp/models/vulnerability.js               | 13 +++
 .../__tests__/__snapshots__/badge.js.snap     |  2 -
 src/web/components/badge/badge.js             |  7 +-
 .../__snapshots__/compliancestatusbar.js.snap |  2 -
 .../__snapshots__/progressbar.js.snap         |  2 -
 .../__snapshots__/severitybar.js.snap         |  2 -
 .../__tests__/__snapshots__/statusbar.js.snap |  2 -
 .../__tests__/__snapshots__/titlebar.js.snap  |  4 -
 src/web/components/bar/progressbar.js         |  7 +-
 .../__snapshots__/multistepfooter.js.snap     |  2 -
 .../components/dialog/scrollablecontent.js    |  5 +-
 .../__snapshots__/errormessage.js.snap        |  2 -
 src/web/components/folding/folding.js         |  3 +-
 .../__tests__/__snapshots__/checkbox.js.snap  |  1 -
 .../__tests__/__snapshots__/formgroup.js.snap |  3 -
 .../__tests__/__snapshots__/radio.js.snap     |  2 -
 .../__snapshots__/selectelement.js.snap       |  2 -
 .../__snapshots__/yesnoradio.js.snap          |  3 -
 .../form/__tests__/selectelement.js           |  6 +-
 src/web/components/form/field.js              |  5 +-
 src/web/components/form/formgroup.js          |  9 +-
 src/web/components/form/loadingbutton.js      |  5 +-
 src/web/components/form/radio.js              |  5 +-
 src/web/components/form/select.js             |  3 +-
 src/web/components/form/selectelements.js     | 14 ++-
 src/web/components/form/textarea.js           |  5 +-
 src/web/components/form/useFormValidation.js  |  3 +-
 src/web/components/icon/svgicon.js            |  5 +-
 src/web/components/icon/withIconSize.js       | 99 ++++++++++---------
 .../__snapshots__/severityclass.js.snap       |  2 -
 src/web/components/label/severityclass.js     |  5 +-
 .../__snapshots__/horizontalsep.js.snap       |  6 --
 src/web/components/layout/divider.js          |  5 +-
 src/web/components/layout/horizontalsep.js    |  5 +-
 src/web/components/link/detailslink.js        |  6 +-
 .../__tests__/__snapshots__/usermenu.js.snap  |  4 -
 src/web/components/panel/infopanel.js         |  7 +-
 .../__snapshots__/applyoverridesgroup.js.snap |  6 --
 .../__snapshots__/booleanfiltergroup.js.snap  |  6 --
 .../createnamedfiltergroup.js.snap            |  2 -
 .../__snapshots__/filterstringgroup.js.snap   |  3 -
 .../__snapshots__/firstresultgroup.js.snap    |  3 -
 .../__snapshots__/minqodgroup.js.snap         |  4 -
 .../__snapshots__/resultsperpagegroup.js.snap |  3 -
 .../__snapshots__/severitylevelsgroup.js.snap | 19 ----
 .../__snapshots__/severityvaluesgroup.js.snap |  4 -
 .../__snapshots__/solutiontypegroup.js.snap   |  9 --
 .../__snapshots__/sortbygroup.js.snap         |  5 -
 .../__snapshots__/tasktrendgroup.js.snap      |  3 -
 .../__snapshots__/ticketstatusgroup.js.snap   |  3 -
 src/web/components/sortable/emptyrow.js       |  5 +-
 src/web/components/sortable/item.js           |  3 +-
 src/web/components/sortable/row.js            |  3 +-
 src/web/components/tab/tab.js                 |  7 +-
 src/web/components/tab/tablist.js             |  2 +-
 src/web/components/table/head.js              | 40 ++++----
 src/web/components/table/table.js             |  3 +-
 .../__snapshots__/tagsdialog.js.snap          | 22 -----
 src/web/entities/filterprovider.js            | 15 +--
 src/web/entities/table.js                     | 17 ++--
 src/web/entity/permissions.js                 | 12 +--
 .../__tests__/__snapshots__/actions.js.snap   |  1 -
 .../__tests__/__snapshots__/details.js.snap   |  1 -
 .../__snapshots__/detailspage.js.snap         | 39 +-------
 .../__tests__/__snapshots__/listpage.js.snap  | 31 +-----
 .../__tests__/__snapshots__/row.js.snap       |  6 --
 .../__tests__/__snapshots__/table.js.snap     | 30 +-----
 src/web/pages/audits/component.js             |  2 +-
 src/web/pages/certbund/detailspage.js         |  2 +-
 src/web/pages/credentials/component.js        | 21 ++--
 src/web/pages/credentials/dialog.js           |  6 +-
 src/web/pages/cves/__tests__/listpage.js      |  3 +-
 src/web/pages/cves/__tests__/row.js           |  3 +-
 src/web/pages/cves/__tests__/table.js         |  9 +-
 src/web/pages/cves/row.js                     | 49 +++++----
 src/web/pages/cves/table.js                   |  1 -
 src/web/pages/hosts/identifiers.js            | 23 +++--
 .../__tests__/__snapshots__/dialog.js.snap    | 18 ----
 src/web/pages/login/loginform.js              |  2 +-
 src/web/pages/nvts/__tests__/listpage.js      | 12 +--
 .../startendtimeselection.js.snap             | 14 ---
 src/web/pages/performance/performancepage.js  |  5 +-
 .../__tests__/__snapshots__/details.js.snap   |  1 -
 .../__snapshots__/detailspage.js.snap         | 17 +---
 .../__tests__/__snapshots__/dialog.js.snap    |  7 --
 .../__tests__/__snapshots__/listpage.js.snap  | 23 +----
 .../__tests__/__snapshots__/row.js.snap       |  1 -
 .../__tests__/__snapshots__/table.js.snap     | 13 +--
 .../__tests__/__snapshots__/dialog.js.snap    | 11 ---
 src/web/pages/reports/deltadetailspage.js     | 95 +++++++++---------
 src/web/pages/reports/details/summary.js      |  5 +-
 src/web/pages/reports/row.js                  |  2 +-
 src/web/pages/results/__tests__/row.js        | 16 ++-
 src/web/pages/results/details.js              | 14 ++-
 src/web/pages/results/detailspage.js          |  2 +-
 .../__tests__/__snapshots__/details.js.snap   |  1 -
 .../__snapshots__/detailspage.js.snap         | 19 +---
 .../editconfigfamilydialog.js.snap            | 10 +-
 .../__snapshots__/editdialog.js.snap          | 48 +--------
 .../__tests__/__snapshots__/listpage.js.snap  | 28 +-----
 .../__tests__/__snapshots__/row.js.snap       |  1 -
 .../__tests__/__snapshots__/table.js.snap     | 17 +---
 .../__tests__/__snapshots__/dialog.js.snap    | 13 ---
 src/web/pages/scanners/component.js           | 24 ++---
 .../__tests__/__snapshots__/actions.js.snap   |  1 -
 .../autodeletereportsgroup.js.snap            |  6 --
 .../__snapshots__/containerdialog.js.snap     | 20 ----
 .../__tests__/__snapshots__/details.js.snap   |  1 -
 .../__snapshots__/detailspage.js.snap         | 52 +---------
 .../__tests__/__snapshots__/listpage.js.snap  |  1 -
 .../tasks/__tests__/__snapshots__/row.js.snap |  6 --
 .../__tests__/__snapshots__/status.js.snap    |  2 -
 .../__tests__/__snapshots__/table.js.snap     | 34 ++-----
 .../__snapshots__/createdialog.js.snap        |  7 --
 .../__snapshots__/editdialog.js.snap          | 16 ---
 src/web/pages/tickets/details.js              |  2 +-
 .../pages/usersettings/usersettingspage.js    |  2 +-
 src/web/utils/proptypes.js                    | 24 ++---
 src/web/utils/render.js                       |  5 +-
 src/web/utils/styledConfig.js                 | 25 +++++
 122 files changed, 456 insertions(+), 872 deletions(-)
 create mode 100644 src/web/utils/styledConfig.js

diff --git a/src/gmp/model.js b/src/gmp/model.js
index 36216c849a..7abe0064e3 100644
--- a/src/gmp/model.js
+++ b/src/gmp/model.js
@@ -73,6 +73,12 @@ class Model {
       delete copy.end_time;
     }
 
+    if (isDefined(element.timestamp)) {
+      if (element.timestamp.length > 0) {
+        copy.timestamp = parseDate(element.timestamp);
+      }
+    }
+
     if (isDefined(element.permissions)) {
       // these are the permissions the current user has on the entity
       const caps = map(element.permissions.permission, perm => perm.name);
diff --git a/src/gmp/models/cve.js b/src/gmp/models/cve.js
index bd66d52a92..0ca36203a6 100644
--- a/src/gmp/models/cve.js
+++ b/src/gmp/models/cve.js
@@ -144,9 +144,13 @@ class Cve extends Info {
 
       const products = entry['vulnerable-software-list'];
       if (isDefined(products)) {
-        ret.products = isArray(products.product)
-          ? products.product
-          : [products.product];
+        if (isDefined(products.product)) {
+          ret.products = isArray(products.product)
+            ? products.product
+            : [products.product];
+        } else {
+          ret.products = [];
+        }
       }
 
       delete ret.raw_data;
diff --git a/src/gmp/models/vulnerability.js b/src/gmp/models/vulnerability.js
index f40c0e5807..97c752c9e4 100644
--- a/src/gmp/models/vulnerability.js
+++ b/src/gmp/models/vulnerability.js
@@ -16,9 +16,22 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 import Model from 'gmp/model';
+import {isDefined} from 'gmp/utils/identity';
+import {parseDate} from 'gmp/parser';
 
 class Vulnerability extends Model {
   static entityType = 'vulnerability';
+
+  static parseElement(element) {
+    const ret = super.parseElement(element);
+
+    if (isDefined(ret.results)) {
+      ret.results.newest = parseDate(ret.results.newest);
+      ret.results.oldest = parseDate(ret.results.newest);
+    }
+
+    return ret;
+  }
 }
 
 export default Vulnerability;
diff --git a/src/web/components/badge/__tests__/__snapshots__/badge.js.snap b/src/web/components/badge/__tests__/__snapshots__/badge.js.snap
index 8fb254d3a5..b6d0eb0054 100644
--- a/src/web/components/badge/__tests__/__snapshots__/badge.js.snap
+++ b/src/web/components/badge/__tests__/__snapshots__/badge.js.snap
@@ -60,7 +60,6 @@ exports[`Badge tests should render badge 1`] = `
 
 <div
   class="c0"
-  margin="0"
 >
   <span
     class="c1"
@@ -73,7 +72,6 @@ exports[`Badge tests should render badge 1`] = `
   <span
     class="c2"
     data-testid="badge-icon"
-    margin="0"
   >
     1
   </span>
diff --git a/src/web/components/badge/badge.js b/src/web/components/badge/badge.js
index 7eb19cac02..2fe4579824 100644
--- a/src/web/components/badge/badge.js
+++ b/src/web/components/badge/badge.js
@@ -24,8 +24,9 @@ import {isDefined, hasValue} from 'gmp/utils/identity';
 
 import PropTypes from 'web/utils/proptypes';
 import Theme from 'web/utils/theme';
+import {excludePropsConfig} from 'web/utils/styledConfig';
 
-const BadgeContainer = styled.div`
+const BadgeContainer = styled.div.withConfig(excludePropsConfig('margin'))`
   position: relative;
   display: inline-flex;
   margin-right: ${props => props.margin}px;
@@ -33,7 +34,9 @@ const BadgeContainer = styled.div`
 
 BadgeContainer.displayName = 'BadgeContainer';
 
-const BadgeIcon = styled.span`
+const BadgeIcon = styled.span.withConfig(
+  excludePropsConfig(['backgroundColor', 'margin']),
+)`
   display: flex;
   flex-direction: row;
   flex-wrap: wrap;
diff --git a/src/web/components/bar/__tests__/__snapshots__/compliancestatusbar.js.snap b/src/web/components/bar/__tests__/__snapshots__/compliancestatusbar.js.snap
index f3b743fcfe..ef4da61267 100644
--- a/src/web/components/bar/__tests__/__snapshots__/compliancestatusbar.js.snap
+++ b/src/web/components/bar/__tests__/__snapshots__/compliancestatusbar.js.snap
@@ -48,7 +48,6 @@ exports[`ComplianceStatusBar tests should render 1`] = `
 }
 
 <div
-  boxbackground="#c83814"
   class="c0"
   data-testid="progressbar-box"
   title="75%"
@@ -57,7 +56,6 @@ exports[`ComplianceStatusBar tests should render 1`] = `
     background="#70c000"
     class="c1"
     data-testid="progress"
-    progress="75"
   />
   <div
     class="c2"
diff --git a/src/web/components/bar/__tests__/__snapshots__/progressbar.js.snap b/src/web/components/bar/__tests__/__snapshots__/progressbar.js.snap
index e9e2ee18fd..028c82397c 100644
--- a/src/web/components/bar/__tests__/__snapshots__/progressbar.js.snap
+++ b/src/web/components/bar/__tests__/__snapshots__/progressbar.js.snap
@@ -48,7 +48,6 @@ exports[`ProgressBar tests should render 1`] = `
 }
 
 <div
-  boxbackground="#4C4C4C"
   class="c0"
   data-testid="progressbar-box"
   title="Progress"
@@ -57,7 +56,6 @@ exports[`ProgressBar tests should render 1`] = `
     background="low"
     class="c1"
     data-testid="progress"
-    progress="10"
   />
   <div
     class="c2"
diff --git a/src/web/components/bar/__tests__/__snapshots__/severitybar.js.snap b/src/web/components/bar/__tests__/__snapshots__/severitybar.js.snap
index b3f6ca6f95..a55ccfa37c 100644
--- a/src/web/components/bar/__tests__/__snapshots__/severitybar.js.snap
+++ b/src/web/components/bar/__tests__/__snapshots__/severitybar.js.snap
@@ -48,7 +48,6 @@ exports[`SeverityBar tests should render 1`] = `
 }
 
 <div
-  boxbackground="#4C4C4C"
   class="c0"
   data-testid="progressbar-box"
   title="High"
@@ -57,7 +56,6 @@ exports[`SeverityBar tests should render 1`] = `
     background="error"
     class="c1"
     data-testid="progress"
-    progress="95"
   />
   <div
     class="c2"
diff --git a/src/web/components/bar/__tests__/__snapshots__/statusbar.js.snap b/src/web/components/bar/__tests__/__snapshots__/statusbar.js.snap
index 25eff9f59a..7445d1d355 100644
--- a/src/web/components/bar/__tests__/__snapshots__/statusbar.js.snap
+++ b/src/web/components/bar/__tests__/__snapshots__/statusbar.js.snap
@@ -51,7 +51,6 @@ exports[`StatusBar tests should render 1`] = `
 }
 
 <div
-  boxbackground="#4C4C4C"
   class="c0"
   data-testid="progressbar-box"
   title="undefined"
@@ -59,7 +58,6 @@ exports[`StatusBar tests should render 1`] = `
   <div
     class="c1"
     data-testid="progress"
-    progress="100"
   />
   <div
     class="c2"
diff --git a/src/web/components/bar/__tests__/__snapshots__/titlebar.js.snap b/src/web/components/bar/__tests__/__snapshots__/titlebar.js.snap
index 6b03019846..13a872e7e1 100644
--- a/src/web/components/bar/__tests__/__snapshots__/titlebar.js.snap
+++ b/src/web/components/bar/__tests__/__snapshots__/titlebar.js.snap
@@ -367,7 +367,6 @@ background-color:#f3f3f3 .c13:nth-child(2):hover {
               >
                 <div
                   class="c3 c15"
-                  margin="5px"
                 >
                   <span
                     class="c8 c16"
@@ -391,7 +390,6 @@ background-color:#f3f3f3 .c13:nth-child(2):hover {
               >
                 <div
                   class="c3 c15"
-                  margin="5px"
                 >
                   <span
                     class="c8 c16"
@@ -431,7 +429,6 @@ background-color:#f3f3f3 .c13:nth-child(2):hover {
                 >
                   <div
                     class="c3 c15"
-                    margin="5px"
                   >
                     <span
                       class="c8 c16"
@@ -457,7 +454,6 @@ background-color:#f3f3f3 .c13:nth-child(2):hover {
               >
                 <div
                   class="c3 c15"
-                  margin="5px"
                 >
                   <span
                     class="c8 c16"
diff --git a/src/web/components/bar/progressbar.js b/src/web/components/bar/progressbar.js
index 54445ab1ba..1061b8a44a 100644
--- a/src/web/components/bar/progressbar.js
+++ b/src/web/components/bar/progressbar.js
@@ -21,9 +21,12 @@ import React from 'react';
 import styled from 'styled-components';
 
 import PropTypes from 'web/utils/proptypes.js';
+import {excludePropsConfig} from 'web/utils/styledConfig';
 import Theme from 'web/utils/theme.js';
 
-const ProgressBarBox = styled.div`
+const ProgressBarBox = styled.div.withConfig(
+  excludePropsConfig(['boxBackground']),
+)`
   height: 13px;
   box-sizing: content-box; /* height includes border */
   display: inline-block;
@@ -63,7 +66,7 @@ export const adjustProgress = progress => {
   return progress;
 };
 
-const Progress = styled.div`
+const Progress = styled.div.withConfig(excludePropsConfig(['progress']))`
   height: 13px;
 
   @media print {
diff --git a/src/web/components/dialog/__tests__/__snapshots__/multistepfooter.js.snap b/src/web/components/dialog/__tests__/__snapshots__/multistepfooter.js.snap
index 7effb30315..c9346abc01 100644
--- a/src/web/components/dialog/__tests__/__snapshots__/multistepfooter.js.snap
+++ b/src/web/components/dialog/__tests__/__snapshots__/multistepfooter.js.snap
@@ -182,7 +182,6 @@ exports[`MultiStepFooter tests should render 1`] = `
   >
     <div
       class="c6 c8"
-      margin="5px"
     >
       <button
         class="c3 c4 c9"
@@ -404,7 +403,6 @@ exports[`MultiStepFooter tests should render loading and disable cancel button 1
   >
     <div
       class="c6 c8"
-      margin="5px"
     >
       <button
         class="c3 c4 c9"
diff --git a/src/web/components/dialog/scrollablecontent.js b/src/web/components/dialog/scrollablecontent.js
index bdb907faba..58eb095fa8 100644
--- a/src/web/components/dialog/scrollablecontent.js
+++ b/src/web/components/dialog/scrollablecontent.js
@@ -21,10 +21,13 @@ import React from 'react';
 import styled from 'styled-components';
 
 import PropTypes from 'web/utils/proptypes';
+import {excludePropsConfig} from 'web/utils/styledConfig';
 
 import Layout from 'web/components/layout/layout';
 
-const ScrollableContent = styled.div`
+const ScrollableContent = styled.div.withConfig(
+  excludePropsConfig(['maxHeight']),
+)`
   overflow: auto;
   padding: 0 15px;
   width: 100%;
diff --git a/src/web/components/error/__tests__/__snapshots__/errormessage.js.snap b/src/web/components/error/__tests__/__snapshots__/errormessage.js.snap
index 7986bc33af..1738174910 100644
--- a/src/web/components/error/__tests__/__snapshots__/errormessage.js.snap
+++ b/src/web/components/error/__tests__/__snapshots__/errormessage.js.snap
@@ -101,7 +101,6 @@ exports[`ErrorMessage tests should render 1`] = `
   >
     <div
       class="c3 c4"
-      margin="15px"
     >
       <span
         class="c5"
@@ -119,7 +118,6 @@ exports[`ErrorMessage tests should render 1`] = `
         >
           <div
             class="c0 c6"
-            margin="5px"
           >
             <b
               data-testid="error-message"
diff --git a/src/web/components/folding/folding.js b/src/web/components/folding/folding.js
index 8d4966987f..2e79817f56 100644
--- a/src/web/components/folding/folding.js
+++ b/src/web/components/folding/folding.js
@@ -20,6 +20,7 @@ import React from 'react';
 import styled, {keyframes, css} from 'styled-components';
 
 import PropTypes from 'web/utils/proptypes';
+import {excludePropsConfig} from 'web/utils/styledConfig';
 
 /**
  * State used in foldable components
@@ -42,7 +43,7 @@ const foldDelay = keyframes`
   }
 `;
 
-const Div = styled.div`
+const Div = styled.div.withConfig(excludePropsConfig(['foldState']))`
   overflow: hidden;
   transition: 0.4s;
 
diff --git a/src/web/components/form/__tests__/__snapshots__/checkbox.js.snap b/src/web/components/form/__tests__/__snapshots__/checkbox.js.snap
index 2038089eba..c30a402e34 100644
--- a/src/web/components/form/__tests__/__snapshots__/checkbox.js.snap
+++ b/src/web/components/form/__tests__/__snapshots__/checkbox.js.snap
@@ -94,7 +94,6 @@ exports[`CheckBox component tests should render with children 1`] = `
   >
     <div
       class="c1 c3"
-      margin="5px"
     >
       <input
         class="c4 c5"
diff --git a/src/web/components/form/__tests__/__snapshots__/formgroup.js.snap b/src/web/components/form/__tests__/__snapshots__/formgroup.js.snap
index bdb778a0ab..9cb5643ddf 100644
--- a/src/web/components/form/__tests__/__snapshots__/formgroup.js.snap
+++ b/src/web/components/form/__tests__/__snapshots__/formgroup.js.snap
@@ -103,15 +103,12 @@ exports[`FormGroup tests should render with title 1`] = `
   <label
     class="c1"
     data-testid="formgroup-title"
-    titleoffset="0"
-    titlesize="2"
   >
     Foo
   </label>
   <div
     class="c2 c3"
     data-testid="formgroup-content"
-    size="10"
   />
 </div>
 `;
diff --git a/src/web/components/form/__tests__/__snapshots__/radio.js.snap b/src/web/components/form/__tests__/__snapshots__/radio.js.snap
index 2b857bfccf..2722edbfc5 100644
--- a/src/web/components/form/__tests__/__snapshots__/radio.js.snap
+++ b/src/web/components/form/__tests__/__snapshots__/radio.js.snap
@@ -94,7 +94,6 @@ exports[`Radio tests should render radio 1`] = `
   >
     <div
       class="c1 c3"
-      margin="5px"
     >
       <input
         class="c4 c5"
@@ -200,7 +199,6 @@ exports[`Radio tests should render radio with children 1`] = `
   >
     <div
       class="c1 c3"
-      margin="5px"
     >
       <input
         class="c4 c5"
diff --git a/src/web/components/form/__tests__/__snapshots__/selectelement.js.snap b/src/web/components/form/__tests__/__snapshots__/selectelement.js.snap
index 0a3b4ad880..85371aeb40 100644
--- a/src/web/components/form/__tests__/__snapshots__/selectelement.js.snap
+++ b/src/web/components/form/__tests__/__snapshots__/selectelement.js.snap
@@ -314,7 +314,6 @@ exports[`Menu tests should render with position adjust 1`] = `
 <div
   class="c0"
   data-testid="select-menu"
-  position="adjust"
   right="0"
   width="0"
   x="0"
@@ -385,7 +384,6 @@ exports[`Menu tests should render with position right 1`] = `
 <div
   class="c0"
   data-testid="select-menu"
-  position="right"
   right="0"
   width="0"
   x="0"
diff --git a/src/web/components/form/__tests__/__snapshots__/yesnoradio.js.snap b/src/web/components/form/__tests__/__snapshots__/yesnoradio.js.snap
index f7016532ef..32d1995d3c 100644
--- a/src/web/components/form/__tests__/__snapshots__/yesnoradio.js.snap
+++ b/src/web/components/form/__tests__/__snapshots__/yesnoradio.js.snap
@@ -98,7 +98,6 @@ exports[`YesNoRadio tests should render 1`] = `
   >
     <div
       class="c0 c2"
-      margin="5px"
     >
       <label
         class="c3"
@@ -108,7 +107,6 @@ exports[`YesNoRadio tests should render 1`] = `
         >
           <div
             class="c0 c2"
-            margin="5px"
           >
             <input
               class="c4 c5"
@@ -133,7 +131,6 @@ exports[`YesNoRadio tests should render 1`] = `
         >
           <div
             class="c0 c2"
-            margin="5px"
           >
             <input
               class="c4 c5"
diff --git a/src/web/components/form/__tests__/selectelement.js b/src/web/components/form/__tests__/selectelement.js
index 0b4471dc3e..9f35ce7ef7 100644
--- a/src/web/components/form/__tests__/selectelement.js
+++ b/src/web/components/form/__tests__/selectelement.js
@@ -208,7 +208,9 @@ class MenuTestComponent extends React.Component {
     super(...args);
 
     this.target = React.createRef();
-    this.mockBoundingClientRect = this.props.mockBoundingClientRect;
+    const {mockBoundingClientRect, ...otherProps} = this.props;
+    this.mockBoundingClientRect = mockBoundingClientRect;
+    this.otherProps = otherProps;
     this.notifyRefAssigned = jest.fn();
   }
 
@@ -238,7 +240,7 @@ class MenuTestComponent extends React.Component {
         />
         {hasTarget && (
           <Menu
-            {...this.props}
+            {...this.otherProps}
             notifyRefAssigned={this.notifyRefAssigned}
             target={this.target}
           />
diff --git a/src/web/components/form/field.js b/src/web/components/form/field.js
index eb3f6a214e..8d4c43ced4 100644
--- a/src/web/components/form/field.js
+++ b/src/web/components/form/field.js
@@ -22,13 +22,16 @@ import PropTypes from 'web/utils/proptypes';
 
 import styled from 'styled-components';
 
+import {excludePropsConfig} from 'web/utils/styledConfig';
 import Theme from 'web/utils/theme';
 
 import withLayout from 'web/components/layout/withLayout';
 
 export const DISABLED_OPACITY = 0.65;
 
-const StyledInput = styled.input`
+const StyledInput = styled.input.withConfig(
+  excludePropsConfig(['convert', 'hasError']),
+)`
   /* use font and line settings from parents not from browser default */
   font-family: inherit;
   font-size: inherit;
diff --git a/src/web/components/form/formgroup.js b/src/web/components/form/formgroup.js
index f86b42aba2..644fc9e866 100644
--- a/src/web/components/form/formgroup.js
+++ b/src/web/components/form/formgroup.js
@@ -25,6 +25,7 @@ import {parseInt} from 'gmp/parser';
 
 import Layout from 'web/components/layout/layout';
 import PropTypes from 'web/utils/proptypes';
+import {excludePropsConfig} from 'web/utils/styledConfig';
 
 const COLUMNS = [
   '0',
@@ -49,7 +50,9 @@ const FormGroupLayout = styled.div`
   padding-bottom: 10px;
 `;
 
-const Title = styled.label`
+const Title = styled.label.withConfig(
+  excludePropsConfig(['titleSize', 'titleOffset']),
+)`
   display: inline-block;
   max-width: 100%;
   font-weight: bold;
@@ -60,7 +63,9 @@ const Title = styled.label`
   margin-left: ${props => COLUMNS[props.titleOffset]};
 `;
 
-const FormGroupContent = styled(Layout)`
+const FormGroupContent = styled(Layout).withConfig(
+  excludePropsConfig(['size', 'offset']),
+)`
   ${props => {
     const ret = {};
     if (isDefined(props.size)) {
diff --git a/src/web/components/form/loadingbutton.js b/src/web/components/form/loadingbutton.js
index ff87dfbd54..8946b5c7eb 100644
--- a/src/web/components/form/loadingbutton.js
+++ b/src/web/components/form/loadingbutton.js
@@ -20,8 +20,11 @@ import styled from 'styled-components';
 import Button from 'web/components/form/button';
 
 import Theme from 'web/utils/theme';
+import {excludePropsConfig} from 'web/utils/styledConfig';
 
-const LoadingButton = styled(Button)`
+const LoadingButton = styled(Button).withConfig(
+  excludePropsConfig('isLoading'),
+)`
   color: ${props => (props.isLoading ? 'rgba(0, 0, 0, 0.0)' : Theme.darkGray)};
   background: ${props =>
     props.isLoading
diff --git a/src/web/components/form/radio.js b/src/web/components/form/radio.js
index aed0dbf84e..2639046071 100644
--- a/src/web/components/form/radio.js
+++ b/src/web/components/form/radio.js
@@ -23,6 +23,7 @@ import {isDefined} from 'gmp/utils/identity';
 
 import compose from 'web/utils/compose';
 import PropTypes from 'web/utils/proptypes';
+import {excludePropsConfig} from 'web/utils/styledConfig';
 
 import Divider from 'web/components/layout/divider';
 import withLayout from 'web/components/layout/withLayout';
@@ -36,7 +37,9 @@ export const StyledElement = styled.label`
   ${props => (props.disabled ? {cursor: 'not-allowed'} : undefined)};
 `;
 
-export const StyledInput = styled.input`
+export const StyledInput = styled.input.withConfig(
+  excludePropsConfig(['convert']),
+)`
   /* use font and line settings from parents not from browser default */
   font-family: inherit;
   font-size: inherit;
diff --git a/src/web/components/form/select.js b/src/web/components/form/select.js
index 2287ed7cc8..7de202a54c 100644
--- a/src/web/components/form/select.js
+++ b/src/web/components/form/select.js
@@ -44,12 +44,13 @@ import {
 } from './selectelements';
 
 import {Marker} from './useFormValidation';
+import {excludePropsConfig} from 'web/utils/styledConfig';
 
 const SingleSelectedValue = styled(SelectedValue)`
   cursor: default;
 `;
 
-const Div = styled.div`
+const Div = styled.div.withConfig(excludePropsConfig(['hasError']))`
   display: flex;
 `;
 
diff --git a/src/web/components/form/selectelements.js b/src/web/components/form/selectelements.js
index 1e70d2e2dd..f5e74d9c3b 100644
--- a/src/web/components/form/selectelements.js
+++ b/src/web/components/form/selectelements.js
@@ -24,10 +24,13 @@ import {isDefined, hasValue} from 'gmp/utils/identity';
 
 import Theme from 'web/utils/theme';
 import PropTypes from 'web/utils/proptypes';
+import {excludePropsConfig} from 'web/utils/styledConfig';
 
 import Portal from 'web/components/portal/portal';
 
-export const Box = styled.div`
+export const Box = styled.div.withConfig(
+  excludePropsConfig(['hasError', 'isOpen']),
+)`
   border: 1px solid ${Theme.inputBorderGray};
   border-radius: 2px;
   display: flex;
@@ -59,7 +62,9 @@ export const Input = styled.input`
   line-height: inherit;
 `;
 
-export const Item = styled.span`
+export const Item = styled.span.withConfig(
+  excludePropsConfig(['isActive', 'isSelected']),
+)`
   padding: 1px 5px;
   cursor: pointer;
   &:hover {
@@ -84,7 +89,7 @@ export const ItemContainer = styled.div`
   flex-direction: column;
 `;
 
-const MenuContainer = styled.div`
+const MenuContainer = styled.div.withConfig(excludePropsConfig(['position']))`
   outline: 0;
   border-radius: 0 0 4px 4px;
   transition: opacity 0.1s ease;
@@ -196,7 +201,8 @@ class MenuComponent extends React.Component {
   }
 
   render() {
-    const {target, forwardedRef, menuHeight, ...props} = this.props;
+    const {target, forwardedRef, menuHeight, notifyRefAssigned, ...props} =
+      this.props;
 
     if (!hasValue(target) || target.current === null) {
       return null;
diff --git a/src/web/components/form/textarea.js b/src/web/components/form/textarea.js
index 810dd1e78d..83af82fd5f 100644
--- a/src/web/components/form/textarea.js
+++ b/src/web/components/form/textarea.js
@@ -28,8 +28,11 @@ import withLayout from 'web/components/layout/withLayout';
 
 import {DISABLED_OPACITY} from './field';
 import {Marker} from './useFormValidation';
+import {excludePropsConfig} from 'web/utils/styledConfig';
 
-const StyledTextArea = styled.textarea`
+const StyledTextArea = styled.textarea.withConfig(
+  excludePropsConfig(['convert', 'hasError']),
+)`
   display: block;
   height: auto;
   color: ${Theme.darkGray};
diff --git a/src/web/components/form/useFormValidation.js b/src/web/components/form/useFormValidation.js
index 13b090ca84..700086deee 100644
--- a/src/web/components/form/useFormValidation.js
+++ b/src/web/components/form/useFormValidation.js
@@ -24,9 +24,10 @@ import {_, _l} from 'gmp/locale/lang';
 
 import {hasValue, isDefined, isFunction} from 'gmp/utils/identity';
 
+import {excludePropsConfig} from 'web/utils/styledConfig';
 import Theme from 'web/utils/theme';
 
-const StyledMarker = styled.div`
+const StyledMarker = styled.div.withConfig(excludePropsConfig(['isVisible']))`
   color: ${Theme.darkRed};
   color: ${props => props.color};
   font-weight: bold;
diff --git a/src/web/components/icon/svgicon.js b/src/web/components/icon/svgicon.js
index 9db86c4204..d539616cd6 100644
--- a/src/web/components/icon/svgicon.js
+++ b/src/web/components/icon/svgicon.js
@@ -28,12 +28,15 @@ import PropTypes from 'web/utils/proptypes';
 import Theme from 'web/utils/theme';
 
 import withIconSize from 'web/components/icon/withIconSize';
+import {excludePropsConfig} from 'web/utils/styledConfig';
 
 const Anchor = styled.a`
   display: flex;
 `;
 
-const Styled = styled.span`
+const Styled = styled.span.withConfig(
+  excludePropsConfig(['active', 'isLoading']),
+)`
   cursor: ${props => (isDefined(props.onClick) ? 'pointer' : undefined)};
 
   @media print {
diff --git a/src/web/components/icon/withIconSize.js b/src/web/components/icon/withIconSize.js
index 94d2521479..14a0d14c31 100644
--- a/src/web/components/icon/withIconSize.js
+++ b/src/web/components/icon/withIconSize.js
@@ -26,60 +26,65 @@ import {isArray} from 'gmp/utils/identity';
 import {IconSizeContext} from 'web/components/provider/iconsizeprovider';
 
 import PropTypes from 'web/utils/proptypes';
+import {excludePropsConfig} from 'web/utils/styledConfig';
 
 export const ICON_SIZE_LARGE_PIXELS = '50px';
 export const ICON_SIZE_MEDIUM_PIXELS = '24px';
 export const ICON_SIZE_SMALL_PIXELS = '16px';
 
-const withIconSize = (defaultSize = 'small') => Component => {
-  const IconSize = styled(Component)`
-    ${props => {
-      const {iconSize = defaultSize, size = iconSize} = props;
-
-      let width;
-      let height;
-
-      if (size === 'small') {
-        height = width = ICON_SIZE_SMALL_PIXELS;
-      } else if (size === 'medium') {
-        height = width = ICON_SIZE_MEDIUM_PIXELS;
-      } else if (size === 'large') {
-        height = width = ICON_SIZE_LARGE_PIXELS;
-      } else if (size === 'tiny') {
-        height = width = '11px';
-      } else if (isArray(size)) {
-        width = size[0];
-        height = size[1];
-      }
-
-      return {
-        height,
-        width,
-        lineHeight: height,
-        '& *': {
-          height: 'inherit',
-          width: 'inherit',
-        },
-      };
-    }}
-  `;
-
-  const IconSizeWrapper = props => (
-    <IconSizeContext.Consumer>
-      {iconSize => <IconSize {...props} iconSize={iconSize} />}
-    </IconSizeContext.Consumer>
-  );
-
-  IconSizeWrapper.displayName = 'withIconSize';
-
-  IconSizeWrapper.propTypes = {
-    iconSize: PropTypes.iconSize,
-    size: PropTypes.iconSize,
+const withIconSize =
+  (defaultSize = 'small') =>
+  Component => {
+    const IconSize = styled(Component).withConfig(
+      excludePropsConfig(['iconSize']),
+    )`
+      ${props => {
+        const {iconSize = defaultSize, size = iconSize} = props;
+
+        let width;
+        let height;
+
+        if (size === 'small') {
+          height = width = ICON_SIZE_SMALL_PIXELS;
+        } else if (size === 'medium') {
+          height = width = ICON_SIZE_MEDIUM_PIXELS;
+        } else if (size === 'large') {
+          height = width = ICON_SIZE_LARGE_PIXELS;
+        } else if (size === 'tiny') {
+          height = width = '11px';
+        } else if (isArray(size)) {
+          width = size[0];
+          height = size[1];
+        }
+
+        return {
+          height,
+          width,
+          lineHeight: height,
+          '& *': {
+            height: 'inherit',
+            width: 'inherit',
+          },
+        };
+      }}
+    `;
+
+    const IconSizeWrapper = props => (
+      <IconSizeContext.Consumer>
+        {iconSize => <IconSize {...props} iconSize={iconSize} />}
+      </IconSizeContext.Consumer>
+    );
+
+    IconSizeWrapper.displayName = 'withIconSize';
+
+    IconSizeWrapper.propTypes = {
+      iconSize: PropTypes.iconSize,
+      size: PropTypes.iconSize,
+    };
+
+    return hoistStatics(IconSizeWrapper, Component);
   };
 
-  return hoistStatics(IconSizeWrapper, Component);
-};
-
 export default withIconSize;
 
 // vim: set ts=2 sw=2 tw=80:
diff --git a/src/web/components/label/__tests__/__snapshots__/severityclass.js.snap b/src/web/components/label/__tests__/__snapshots__/severityclass.js.snap
index a93fbc56f3..09cd9289bd 100644
--- a/src/web/components/label/__tests__/__snapshots__/severityclass.js.snap
+++ b/src/web/components/label/__tests__/__snapshots__/severityclass.js.snap
@@ -16,8 +16,6 @@ exports[`SeverityClassLabel tests should render 1`] = `
 }
 
 <div
-  backgroundcolor="#C83814"
-  bordercolor="#C83814"
   class="c0"
 >
   High
diff --git a/src/web/components/label/severityclass.js b/src/web/components/label/severityclass.js
index 11b303422f..20691fe26a 100644
--- a/src/web/components/label/severityclass.js
+++ b/src/web/components/label/severityclass.js
@@ -20,8 +20,11 @@ import React from 'react';
 import styled from 'styled-components';
 
 import _ from 'gmp/locale';
+import {excludePropsConfig} from 'web/utils/styledConfig';
 
-const Label = styled.div`
+const Label = styled.div.withConfig(
+  excludePropsConfig(['backgroundColor', 'borderColor']),
+)`
   text-align: center;
   font-weight: normal;
   font-style: normal;
diff --git a/src/web/components/layout/__tests__/__snapshots__/horizontalsep.js.snap b/src/web/components/layout/__tests__/__snapshots__/horizontalsep.js.snap
index 4e87849e9b..668314f21c 100644
--- a/src/web/components/layout/__tests__/__snapshots__/horizontalsep.js.snap
+++ b/src/web/components/layout/__tests__/__snapshots__/horizontalsep.js.snap
@@ -80,7 +80,6 @@ exports[`HorizontalSep tests should allow to wrap 1`] = `
 >
   <div
     class="c2 c3 c4"
-    margin="5px"
   />
 </div>
 `;
@@ -136,7 +135,6 @@ exports[`HorizontalSep tests should render 1`] = `
 >
   <div
     class="c0 c2 c3"
-    margin="5px"
   />
 </div>
 `;
@@ -192,8 +190,6 @@ exports[`HorizontalSep tests should render with separator option 1`] = `
 >
   <div
     class="c0 c2 c3"
-    margin="5px"
-    separator="|"
   />
 </div>
 `;
@@ -249,8 +245,6 @@ exports[`HorizontalSep tests should render with spacing 1`] = `
 >
   <div
     class="c0 c2 c3"
-    margin="5px"
-    separator="|"
     spacing="10px"
   />
 </div>
diff --git a/src/web/components/layout/divider.js b/src/web/components/layout/divider.js
index 053b4529c5..f2a9b3c079 100644
--- a/src/web/components/layout/divider.js
+++ b/src/web/components/layout/divider.js
@@ -21,12 +21,15 @@ import React from 'react';
 import styled from 'styled-components';
 
 import PropTypes from 'web/utils/proptypes';
+import {excludePropsConfig} from 'web/utils/styledConfig';
 
 import Layout from './layout';
 
 const DEFAULT_MARGIN = '5px';
 
-const DividerComponent = styled(Layout)`
+const DividerComponent = styled(Layout).withConfig(
+  excludePropsConfig('margin'),
+)`
   & > * {
     display: inline-flex;
   }
diff --git a/src/web/components/layout/horizontalsep.js b/src/web/components/layout/horizontalsep.js
index 6c190edf2d..72a6fac8ec 100644
--- a/src/web/components/layout/horizontalsep.js
+++ b/src/web/components/layout/horizontalsep.js
@@ -22,8 +22,11 @@ import {isDefined} from 'gmp/utils/identity';
 import PropTypes from 'web/utils/proptypes';
 
 import Divider from './divider';
+import {excludePropsConfig} from 'web/utils/styledConfig';
 
-const HorizontalSep = styled(Divider)`
+const HorizontalSep = styled(Divider).withConfig(
+  excludePropsConfig('separator', 'spacing', 'wrap'),
+)`
   flex-wrap: ${props => (isDefined(props.wrap) ? props.wrap : null)};
   & > *:not(:last-child)::after {
     content: ${({separator = '•'}) => `'${separator}'`};
diff --git a/src/web/components/link/detailslink.js b/src/web/components/link/detailslink.js
index 35b99008f7..1a266a1319 100644
--- a/src/web/components/link/detailslink.js
+++ b/src/web/components/link/detailslink.js
@@ -20,10 +20,12 @@ import React from 'react';
 import PropTypes from 'web/utils/proptypes';
 import withCapabilities from 'web/utils/withCapabilities';
 
+import {isDefined} from 'gmp/utils/identity';
+
 import Link from './link';
 
 const DetailsLink = ({capabilities, id, type, textOnly = false, ...props}) => {
-  textOnly = textOnly || !capabilities.mayAccess(type);
+  textOnly = textOnly || !capabilities.mayAccess(type) || !isDefined(id);
 
   return (
     <Link
@@ -36,7 +38,7 @@ const DetailsLink = ({capabilities, id, type, textOnly = false, ...props}) => {
 };
 
 DetailsLink.propTypes = {
-  capabilities: PropTypes.capabilities.isRequired,
+  capabilities: PropTypes.capabilities,
   id: PropTypes.id.isRequired,
   textOnly: PropTypes.bool,
   type: PropTypes.string.isRequired,
diff --git a/src/web/components/menu/__tests__/__snapshots__/usermenu.js.snap b/src/web/components/menu/__tests__/__snapshots__/usermenu.js.snap
index a1cd6a1796..e5d4bb9779 100644
--- a/src/web/components/menu/__tests__/__snapshots__/usermenu.js.snap
+++ b/src/web/components/menu/__tests__/__snapshots__/usermenu.js.snap
@@ -204,7 +204,6 @@ background-color:#f3f3f3 .c7:nth-child(2):hover {
         >
           <div
             class="c8 c10"
-            margin="5px"
           >
             <span
               class="c2 c11"
@@ -226,7 +225,6 @@ background-color:#f3f3f3 .c7:nth-child(2):hover {
         >
           <div
             class="c8 c10"
-            margin="5px"
           >
             <span
               class="c2 c11"
@@ -266,7 +264,6 @@ background-color:#f3f3f3 .c7:nth-child(2):hover {
           >
             <div
               class="c8 c10"
-              margin="5px"
             >
               <span
                 class="c2 c11"
@@ -292,7 +289,6 @@ background-color:#f3f3f3 .c7:nth-child(2):hover {
         >
           <div
             class="c8 c10"
-            margin="5px"
           >
             <span
               class="c2 c11"
diff --git a/src/web/components/panel/infopanel.js b/src/web/components/panel/infopanel.js
index 5ddcbff038..dc9a66bcaa 100644
--- a/src/web/components/panel/infopanel.js
+++ b/src/web/components/panel/infopanel.js
@@ -24,6 +24,7 @@ import {isDefined} from 'gmp/utils/identity';
 
 import DeleteIcon from 'web/components/icon/deleteicon';
 
+import {excludePropsConfig} from 'web/utils/styledConfig';
 import PropTypes from 'web/utils/proptypes';
 
 import Theme from 'web/utils/theme';
@@ -32,14 +33,16 @@ import Layout from 'web/components/layout/layout';
 
 import Button from './button';
 
-const Panel = styled(Layout)`
+const Panel = styled(Layout).withConfig(
+  excludePropsConfig(['isWarning', 'noMargin']),
+)`
   background-color: ${Theme.white};
   border: 1px solid
     ${props => (props.isWarning ? Theme.darkRed : Theme.lightBlue)};
   margin-top: ${props => (props.noMargin ? '0px' : '5px')};
 `;
 
-const Heading = styled.div`
+const Heading = styled.div.withConfig(excludePropsConfig(['isWarning']))`
   display: flex;
   justify-content: space-between;
   align-items: center;
diff --git a/src/web/components/powerfilter/__tests__/__snapshots__/applyoverridesgroup.js.snap b/src/web/components/powerfilter/__tests__/__snapshots__/applyoverridesgroup.js.snap
index f605d5e9ac..d6683a40d0 100644
--- a/src/web/components/powerfilter/__tests__/__snapshots__/applyoverridesgroup.js.snap
+++ b/src/web/components/powerfilter/__tests__/__snapshots__/applyoverridesgroup.js.snap
@@ -129,15 +129,12 @@ exports[`ApplyOverridesGroup tests should render 1`] = `
   <label
     class="c1"
     data-testid="formgroup-title"
-    titleoffset="0"
-    titlesize="2"
   >
     Apply Overrides
   </label>
   <div
     class="c2 c3"
     data-testid="formgroup-content"
-    size="10"
   >
     <div
       class="c2"
@@ -147,7 +144,6 @@ exports[`ApplyOverridesGroup tests should render 1`] = `
       >
         <div
           class="c2 c5"
-          margin="5px"
         >
           <label
             class="c6"
@@ -157,7 +153,6 @@ exports[`ApplyOverridesGroup tests should render 1`] = `
             >
               <div
                 class="c2 c5"
-                margin="5px"
               >
                 <input
                   class="c7 c8"
@@ -183,7 +178,6 @@ exports[`ApplyOverridesGroup tests should render 1`] = `
             >
               <div
                 class="c2 c5"
-                margin="5px"
               >
                 <input
                   class="c7 c8"
diff --git a/src/web/components/powerfilter/__tests__/__snapshots__/booleanfiltergroup.js.snap b/src/web/components/powerfilter/__tests__/__snapshots__/booleanfiltergroup.js.snap
index 01049d06a7..9d14dc3870 100644
--- a/src/web/components/powerfilter/__tests__/__snapshots__/booleanfiltergroup.js.snap
+++ b/src/web/components/powerfilter/__tests__/__snapshots__/booleanfiltergroup.js.snap
@@ -129,15 +129,12 @@ exports[`BooleanFilterGroup tests should render 1`] = `
   <label
     class="c1"
     data-testid="formgroup-title"
-    titleoffset="0"
-    titlesize="2"
   >
     foo
   </label>
   <div
     class="c2 c3"
     data-testid="formgroup-content"
-    size="10"
   >
     <div
       class="c2"
@@ -147,7 +144,6 @@ exports[`BooleanFilterGroup tests should render 1`] = `
       >
         <div
           class="c2 c5"
-          margin="5px"
         >
           <label
             class="c6"
@@ -157,7 +153,6 @@ exports[`BooleanFilterGroup tests should render 1`] = `
             >
               <div
                 class="c2 c5"
-                margin="5px"
               >
                 <input
                   class="c7 c8"
@@ -183,7 +178,6 @@ exports[`BooleanFilterGroup tests should render 1`] = `
             >
               <div
                 class="c2 c5"
-                margin="5px"
               >
                 <input
                   class="c7 c8"
diff --git a/src/web/components/powerfilter/__tests__/__snapshots__/createnamedfiltergroup.js.snap b/src/web/components/powerfilter/__tests__/__snapshots__/createnamedfiltergroup.js.snap
index d69691cac2..f320ec59cc 100644
--- a/src/web/components/powerfilter/__tests__/__snapshots__/createnamedfiltergroup.js.snap
+++ b/src/web/components/powerfilter/__tests__/__snapshots__/createnamedfiltergroup.js.snap
@@ -150,7 +150,6 @@ exports[`CreateNamedFilterGroup tests should render 1`] = `
   >
     <div
       class="c0 c3"
-      margin="5px"
     >
       <label
         class="c4"
@@ -160,7 +159,6 @@ exports[`CreateNamedFilterGroup tests should render 1`] = `
         >
           <div
             class="c0 c3"
-            margin="5px"
           >
             <input
               class="c5 c6"
diff --git a/src/web/components/powerfilter/__tests__/__snapshots__/filterstringgroup.js.snap b/src/web/components/powerfilter/__tests__/__snapshots__/filterstringgroup.js.snap
index 233cd75f1c..7b5fc6e18b 100644
--- a/src/web/components/powerfilter/__tests__/__snapshots__/filterstringgroup.js.snap
+++ b/src/web/components/powerfilter/__tests__/__snapshots__/filterstringgroup.js.snap
@@ -107,15 +107,12 @@ exports[`FilterStringGroup tests should render 1`] = `
   <label
     class="c1"
     data-testid="formgroup-title"
-    titleoffset="0"
-    titlesize="2"
   >
     Filter
   </label>
   <div
     class="c2 c3"
     data-testid="formgroup-content"
-    size="10"
   >
     <input
       class="c4 c5"
diff --git a/src/web/components/powerfilter/__tests__/__snapshots__/firstresultgroup.js.snap b/src/web/components/powerfilter/__tests__/__snapshots__/firstresultgroup.js.snap
index 94aea7a450..1c1c8ce98c 100644
--- a/src/web/components/powerfilter/__tests__/__snapshots__/firstresultgroup.js.snap
+++ b/src/web/components/powerfilter/__tests__/__snapshots__/firstresultgroup.js.snap
@@ -132,15 +132,12 @@ exports[`FirstresultGroup tests should render 1`] = `
   <label
     class="c1"
     data-testid="formgroup-title"
-    titleoffset="0"
-    titlesize="2"
   >
     First result
   </label>
   <div
     class="c2 c3"
     data-testid="formgroup-content"
-    size="10"
   >
     <span
       class="c4"
diff --git a/src/web/components/powerfilter/__tests__/__snapshots__/minqodgroup.js.snap b/src/web/components/powerfilter/__tests__/__snapshots__/minqodgroup.js.snap
index 70c963a02d..283858a55a 100644
--- a/src/web/components/powerfilter/__tests__/__snapshots__/minqodgroup.js.snap
+++ b/src/web/components/powerfilter/__tests__/__snapshots__/minqodgroup.js.snap
@@ -154,22 +154,18 @@ exports[`MinQodGroup tests should render 1`] = `
   <label
     class="c1"
     data-testid="formgroup-title"
-    titleoffset="0"
-    titlesize="2"
   >
     QoD
   </label>
   <div
     class="c2 c3"
     data-testid="formgroup-content"
-    size="10"
   >
     <div
       class="c2 c4"
     >
       <div
         class="c2 c5"
-        margin="5px"
       >
         <span>
           must be at least
diff --git a/src/web/components/powerfilter/__tests__/__snapshots__/resultsperpagegroup.js.snap b/src/web/components/powerfilter/__tests__/__snapshots__/resultsperpagegroup.js.snap
index 82812b6353..c7a3d05209 100644
--- a/src/web/components/powerfilter/__tests__/__snapshots__/resultsperpagegroup.js.snap
+++ b/src/web/components/powerfilter/__tests__/__snapshots__/resultsperpagegroup.js.snap
@@ -132,15 +132,12 @@ exports[`ResultsPerPageGroup tests should render 1`] = `
   <label
     class="c1"
     data-testid="formgroup-title"
-    titleoffset="0"
-    titlesize="2"
   >
     Results per page
   </label>
   <div
     class="c2 c3"
     data-testid="formgroup-content"
-    size="10"
   >
     <span
       class="c4"
diff --git a/src/web/components/powerfilter/__tests__/__snapshots__/severitylevelsgroup.js.snap b/src/web/components/powerfilter/__tests__/__snapshots__/severitylevelsgroup.js.snap
index 83d52f39f7..99348d474f 100644
--- a/src/web/components/powerfilter/__tests__/__snapshots__/severitylevelsgroup.js.snap
+++ b/src/web/components/powerfilter/__tests__/__snapshots__/severitylevelsgroup.js.snap
@@ -181,22 +181,18 @@ exports[`SeverityLevelsFilterGroup tests should render 1`] = `
   <label
     class="c1"
     data-testid="formgroup-title"
-    titleoffset="0"
-    titlesize="2"
   >
     Severity (Class)
   </label>
   <div
     class="c2 c3"
     data-testid="formgroup-content"
-    size="10"
   >
     <div
       class="c2 c4"
     >
       <div
         class="c2 c5"
-        margin="5px"
       >
         <label
           class="c6"
@@ -206,7 +202,6 @@ exports[`SeverityLevelsFilterGroup tests should render 1`] = `
           >
             <div
               class="c2 c5"
-              margin="5px"
             >
               <input
                 checked=""
@@ -215,8 +210,6 @@ exports[`SeverityLevelsFilterGroup tests should render 1`] = `
                 type="checkbox"
               />
               <div
-                backgroundcolor="#C83814"
-                bordercolor="#C83814"
                 class="c9"
               >
                 High
@@ -232,7 +225,6 @@ exports[`SeverityLevelsFilterGroup tests should render 1`] = `
           >
             <div
               class="c2 c5"
-              margin="5px"
             >
               <input
                 class="c7 c8"
@@ -240,8 +232,6 @@ exports[`SeverityLevelsFilterGroup tests should render 1`] = `
                 type="checkbox"
               />
               <div
-                backgroundcolor="#F0A519"
-                bordercolor="#F0A519"
                 class="c10"
               >
                 Medium
@@ -257,7 +247,6 @@ exports[`SeverityLevelsFilterGroup tests should render 1`] = `
           >
             <div
               class="c2 c5"
-              margin="5px"
             >
               <input
                 class="c7 c8"
@@ -265,8 +254,6 @@ exports[`SeverityLevelsFilterGroup tests should render 1`] = `
                 type="checkbox"
               />
               <div
-                backgroundcolor="#4F91C7"
-                bordercolor="#4F91C7"
                 class="c11"
               >
                 Low
@@ -282,7 +269,6 @@ exports[`SeverityLevelsFilterGroup tests should render 1`] = `
           >
             <div
               class="c2 c5"
-              margin="5px"
             >
               <input
                 class="c7 c8"
@@ -290,8 +276,6 @@ exports[`SeverityLevelsFilterGroup tests should render 1`] = `
                 type="checkbox"
               />
               <div
-                backgroundcolor="#191919"
-                bordercolor="#191919"
                 class="c12"
               >
                 Log
@@ -307,7 +291,6 @@ exports[`SeverityLevelsFilterGroup tests should render 1`] = `
           >
             <div
               class="c2 c5"
-              margin="5px"
             >
               <input
                 class="c7 c8"
@@ -315,8 +298,6 @@ exports[`SeverityLevelsFilterGroup tests should render 1`] = `
                 type="checkbox"
               />
               <div
-                backgroundcolor="#191919"
-                bordercolor="#191919"
                 class="c12"
               >
                 False Pos.
diff --git a/src/web/components/powerfilter/__tests__/__snapshots__/severityvaluesgroup.js.snap b/src/web/components/powerfilter/__tests__/__snapshots__/severityvaluesgroup.js.snap
index 25cd0eb6ce..337bd3d1bc 100644
--- a/src/web/components/powerfilter/__tests__/__snapshots__/severityvaluesgroup.js.snap
+++ b/src/web/components/powerfilter/__tests__/__snapshots__/severityvaluesgroup.js.snap
@@ -386,22 +386,18 @@ exports[`Severity Values Group Tests should render 1`] = `
   <label
     class="c1"
     data-testid="formgroup-title"
-    titleoffset="0"
-    titlesize="2"
   >
     foo
   </label>
   <div
     class="c2 c3"
     data-testid="formgroup-content"
-    size="10"
   >
     <div
       class="c2 c4"
     >
       <div
         class="c2 c5"
-        margin="5px"
       >
         <div
           aria-expanded="false"
diff --git a/src/web/components/powerfilter/__tests__/__snapshots__/solutiontypegroup.js.snap b/src/web/components/powerfilter/__tests__/__snapshots__/solutiontypegroup.js.snap
index c8eaebc981..349998dc40 100644
--- a/src/web/components/powerfilter/__tests__/__snapshots__/solutiontypegroup.js.snap
+++ b/src/web/components/powerfilter/__tests__/__snapshots__/solutiontypegroup.js.snap
@@ -176,15 +176,12 @@ exports[`SolutionTypesFilterGroup tests should render 1`] = `
   <label
     class="c1"
     data-testid="formgroup-title"
-    titleoffset="0"
-    titlesize="2"
   >
     Solution Type
   </label>
   <div
     class="c2 c3"
     data-testid="formgroup-content"
-    size="10"
   >
     <div
       class="c2 c4"
@@ -208,7 +205,6 @@ exports[`SolutionTypesFilterGroup tests should render 1`] = `
                   >
                     <div
                       class="c2 c9"
-                      margin="5px"
                     >
                       <input
                         checked=""
@@ -237,7 +233,6 @@ exports[`SolutionTypesFilterGroup tests should render 1`] = `
                   >
                     <div
                       class="c2 c9"
-                      margin="5px"
                     >
                       <input
                         class="c10 c11"
@@ -277,7 +272,6 @@ exports[`SolutionTypesFilterGroup tests should render 1`] = `
                   >
                     <div
                       class="c2 c9"
-                      margin="5px"
                     >
                       <input
                         class="c10 c11"
@@ -319,7 +313,6 @@ exports[`SolutionTypesFilterGroup tests should render 1`] = `
                   >
                     <div
                       class="c2 c9"
-                      margin="5px"
                     >
                       <input
                         class="c10 c11"
@@ -359,7 +352,6 @@ exports[`SolutionTypesFilterGroup tests should render 1`] = `
                   >
                     <div
                       class="c2 c9"
-                      margin="5px"
                     >
                       <input
                         class="c10 c11"
@@ -399,7 +391,6 @@ exports[`SolutionTypesFilterGroup tests should render 1`] = `
                   >
                     <div
                       class="c2 c9"
-                      margin="5px"
                     >
                       <input
                         class="c10 c11"
diff --git a/src/web/components/powerfilter/__tests__/__snapshots__/sortbygroup.js.snap b/src/web/components/powerfilter/__tests__/__snapshots__/sortbygroup.js.snap
index 582ad2822f..10164ec3b3 100644
--- a/src/web/components/powerfilter/__tests__/__snapshots__/sortbygroup.js.snap
+++ b/src/web/components/powerfilter/__tests__/__snapshots__/sortbygroup.js.snap
@@ -258,15 +258,12 @@ exports[`SortByGroup tests should render 1`] = `
   <label
     class="c1"
     data-testid="formgroup-title"
-    titleoffset="0"
-    titlesize="2"
   >
     Sort by
   </label>
   <div
     class="c2 c3"
     data-testid="formgroup-content"
-    size="10"
   >
     <div
       aria-expanded="false"
@@ -318,7 +315,6 @@ exports[`SortByGroup tests should render 1`] = `
       >
         <div
           class="c2 c15"
-          margin="5px"
         >
           <input
             checked=""
@@ -345,7 +341,6 @@ exports[`SortByGroup tests should render 1`] = `
       >
         <div
           class="c2 c15"
-          margin="5px"
         >
           <input
             class="c16 c17"
diff --git a/src/web/components/powerfilter/__tests__/__snapshots__/tasktrendgroup.js.snap b/src/web/components/powerfilter/__tests__/__snapshots__/tasktrendgroup.js.snap
index 3f647f0e06..a192b298bd 100644
--- a/src/web/components/powerfilter/__tests__/__snapshots__/tasktrendgroup.js.snap
+++ b/src/web/components/powerfilter/__tests__/__snapshots__/tasktrendgroup.js.snap
@@ -364,15 +364,12 @@ exports[`Task Trend Selector Tests should render 1`] = `
   <label
     class="c1"
     data-testid="formgroup-title"
-    titleoffset="0"
-    titlesize="2"
   >
     Trend
   </label>
   <div
     class="c2 c3"
     data-testid="formgroup-content"
-    size="10"
   >
     <div
       aria-expanded="false"
diff --git a/src/web/components/powerfilter/__tests__/__snapshots__/ticketstatusgroup.js.snap b/src/web/components/powerfilter/__tests__/__snapshots__/ticketstatusgroup.js.snap
index 652b5284e3..0e0233e4a1 100644
--- a/src/web/components/powerfilter/__tests__/__snapshots__/ticketstatusgroup.js.snap
+++ b/src/web/components/powerfilter/__tests__/__snapshots__/ticketstatusgroup.js.snap
@@ -364,15 +364,12 @@ exports[`TicketStatusGroup tests should render 1`] = `
   <label
     class="c1"
     data-testid="formgroup-title"
-    titleoffset="0"
-    titlesize="2"
   >
     Ticket Status
   </label>
   <div
     class="c2 c3"
     data-testid="formgroup-content"
-    size="10"
   >
     <div
       aria-expanded="false"
diff --git a/src/web/components/sortable/emptyrow.js b/src/web/components/sortable/emptyrow.js
index 0b3ac62467..2cd8367e73 100644
--- a/src/web/components/sortable/emptyrow.js
+++ b/src/web/components/sortable/emptyrow.js
@@ -22,10 +22,13 @@ import styled from 'styled-components';
 import {Droppable} from 'react-beautiful-dnd';
 
 import PropTypes from 'web/utils/proptypes';
+import {excludePropsConfig} from 'web/utils/styledConfig';
 
 import Theme from 'web/utils/theme';
 
-const EmptyGridRow = styled.div`
+const EmptyGridRow = styled.div.withConfig(
+  excludePropsConfig(['active', 'isDraggingOver']),
+)`
   margin: 8px 0px;
   min-height: 50px;
   display: ${props => (props.active ? 'flex' : 'none')};
diff --git a/src/web/components/sortable/item.js b/src/web/components/sortable/item.js
index ee61ab8c2a..abc2af74b3 100644
--- a/src/web/components/sortable/item.js
+++ b/src/web/components/sortable/item.js
@@ -22,6 +22,7 @@ import styled from 'styled-components';
 import {Draggable} from 'react-beautiful-dnd';
 
 import PropTypes from 'web/utils/proptypes';
+import {excludePropsConfig} from 'web/utils/styledConfig';
 
 export const GRID_ITEM_MARGIN = {
   top: 5,
@@ -30,7 +31,7 @@ export const GRID_ITEM_MARGIN = {
   right: 8,
 };
 
-const GridItem = styled.div`
+const GridItem = styled.div.withConfig(excludePropsConfig(['isDragging']))`
   display: flex;
   flex-grow: 1;
   flex-shrink: 1;
diff --git a/src/web/components/sortable/row.js b/src/web/components/sortable/row.js
index c1fe40154f..8062cc2c17 100644
--- a/src/web/components/sortable/row.js
+++ b/src/web/components/sortable/row.js
@@ -25,13 +25,14 @@ import {isDefined} from 'gmp/utils/identity';
 
 import PropTypes from 'web/utils/proptypes';
 
+import {excludePropsConfig} from 'web/utils/styledConfig';
 import Theme from 'web/utils/theme';
 
 import Resizer from './resizer';
 
 const MIN_HEIGHT = 175;
 
-const GridRow = styled.div`
+const GridRow = styled.div.withConfig(excludePropsConfig(['isDraggingOver']))`
   display: flex;
   height: ${props => props.height}px;
   min-height: ${MIN_HEIGHT}px;
diff --git a/src/web/components/tab/tab.js b/src/web/components/tab/tab.js
index 53edb0400e..ecb1195ced 100644
--- a/src/web/components/tab/tab.js
+++ b/src/web/components/tab/tab.js
@@ -23,8 +23,9 @@ import styled from 'styled-components';
 import Theme from 'web/utils/theme.js';
 
 import PropTypes from 'web/utils/proptypes.js';
+import {excludePropsConfig} from 'web/utils/styledConfig';
 
-const StyledDiv = styled.div`
+const StyledDiv = styled.div.withConfig(excludePropsConfig(['active']))`
   font-size: 16px;
   display: flex;
   align-items: start;
@@ -48,7 +49,9 @@ const StyledDiv = styled.div`
     props.active ? '2px solid ' + Theme.green : '2px solid ' + Theme.white};
   :hover {
     border-top: ${props =>
-      props.active ? undefined : '2px solid ' + Theme.lightGray};
+      props.active
+        ? '2px solid ' + Theme.white
+        : '2px solid ' + Theme.lightGray};
   }
   :first-child {
     border-left: ${props =>
diff --git a/src/web/components/tab/tablist.js b/src/web/components/tab/tablist.js
index c5f3030af0..607a7c583d 100644
--- a/src/web/components/tab/tablist.js
+++ b/src/web/components/tab/tablist.js
@@ -24,7 +24,7 @@ import Layout from '../layout/layout.js';
 
 const TabList = ({active = 0, children, onActivateTab, ...props}) => {
   children = React.Children.map(children, (child, index) => {
-    if (child !== null) {
+    if (child !== null && child.type !== Layout) {
       return React.cloneElement(child, {
         isActive: active === index,
         onActivate: () => onActivateTab(index),
diff --git a/src/web/components/table/head.js b/src/web/components/table/head.js
index 95eb9fc8ff..65fa73eb66 100644
--- a/src/web/components/table/head.js
+++ b/src/web/components/table/head.js
@@ -47,25 +47,27 @@ const TableHead = ({
   let sortSymbol;
   if (isDefined(sortBy) && currentSortBy === sortBy) {
     if (currentSortDir === Sort.DESC) {
-      sortSymbol = ( // triangle pointing down
-        <span
-          title={_('Sorted In Descending Order By {{sortBy}}', {
-            sortBy: `${title}`,
-          })}
-        >
-          &nbsp;&#9660;
-        </span>
-      );
+      sortSymbol = // triangle pointing down
+        (
+          <span
+            title={_('Sorted In Descending Order By {{sortBy}}', {
+              sortBy: `${title}`,
+            })}
+          >
+            &nbsp;&#9660;
+          </span>
+        );
     } else if (currentSortDir === Sort.ASC) {
-      sortSymbol = ( // triangle pointing up
-        <span
-          title={_('Sorted In Ascending Order By {{sortBy}}', {
-            sortBy: `${title}`,
-          })}
-        >
-          &nbsp;&#9650;
-        </span>
-      );
+      sortSymbol = // triangle pointing up
+        (
+          <span
+            title={_('Sorted In Ascending Order By {{sortBy}}', {
+              sortBy: `${title}`,
+            })}
+          >
+            &nbsp;&#9650;
+          </span>
+        );
     }
   }
   if (isDefined(title) && !isDefined(children)) {
@@ -110,7 +112,7 @@ export default styled(TableHead)`
   @media print {
     color: ${Theme.black};
     font-size: 1.2em;
-    background-color: none;
+    background-color: transparent;
     font-weight: bold;
   }
 `;
diff --git a/src/web/components/table/table.js b/src/web/components/table/table.js
index a542c464b4..de6e113c4b 100644
--- a/src/web/components/table/table.js
+++ b/src/web/components/table/table.js
@@ -21,6 +21,7 @@ import React from 'react';
 import styled from 'styled-components';
 
 import PropTypes from 'web/utils/proptypes';
+import {excludePropsConfig} from 'web/utils/styledConfig';
 
 const Table = ({children, className, footer, header}) => {
   return (
@@ -39,7 +40,7 @@ Table.propTypes = {
   header: PropTypes.element,
 };
 
-export default styled(Table)`
+export default styled(Table).withConfig(excludePropsConfig(['fixed', 'size']))`
   border: 0;
   border-spacing: 0px;
   font-size: 12px;
diff --git a/src/web/entities/__tests__/__snapshots__/tagsdialog.js.snap b/src/web/entities/__tests__/__snapshots__/tagsdialog.js.snap
index d4e2f74a70..f92b5e8178 100644
--- a/src/web/entities/__tests__/__snapshots__/tagsdialog.js.snap
+++ b/src/web/entities/__tests__/__snapshots__/tagsdialog.js.snap
@@ -579,7 +579,6 @@ exports[`TagsDialog dialog component tests should disable tag selection when no
               <div
                 class="c9"
                 data-testid="save-dialog-content"
-                maxheight="400px"
               >
                 <div
                   class="c10"
@@ -590,22 +589,18 @@ exports[`TagsDialog dialog component tests should disable tag selection when no
                     <label
                       class="c12"
                       data-testid="formgroup-title"
-                      titleoffset="0"
-                      titlesize="4"
                     >
                       Choose Tag
                     </label>
                     <div
                       class="c13 c14"
                       data-testid="formgroup-content"
-                      size="8"
                     >
                       <div
                         class="c13 c15"
                       >
                         <div
                           class="c13 c16"
-                          margin="5px"
                         >
                           <div
                             aria-expanded="false"
@@ -672,15 +667,12 @@ exports[`TagsDialog dialog component tests should disable tag selection when no
                     <label
                       class="c12"
                       data-testid="formgroup-title"
-                      titleoffset="0"
-                      titlesize="4"
                     >
                       Value
                     </label>
                     <div
                       class="c13 c14"
                       data-testid="formgroup-content"
-                      size="8"
                     />
                   </div>
                   <div
@@ -689,15 +681,12 @@ exports[`TagsDialog dialog component tests should disable tag selection when no
                     <label
                       class="c12"
                       data-testid="formgroup-title"
-                      titleoffset="0"
-                      titlesize="4"
                     >
                       Comment
                     </label>
                     <div
                       class="c13 c14"
                       data-testid="formgroup-content"
-                      size="8"
                     />
                   </div>
                 </div>
@@ -1315,7 +1304,6 @@ exports[`TagsDialog dialog component tests should render dialog 1`] = `
               <div
                 class="c9"
                 data-testid="save-dialog-content"
-                maxheight="400px"
               >
                 <div
                   class="c10"
@@ -1326,22 +1314,18 @@ exports[`TagsDialog dialog component tests should render dialog 1`] = `
                     <label
                       class="c12"
                       data-testid="formgroup-title"
-                      titleoffset="0"
-                      titlesize="4"
                     >
                       Choose Tag
                     </label>
                     <div
                       class="c13 c14"
                       data-testid="formgroup-content"
-                      size="8"
                     >
                       <div
                         class="c13 c15"
                       >
                         <div
                           class="c13 c16"
-                          margin="5px"
                         >
                           <div
                             aria-expanded="false"
@@ -1406,15 +1390,12 @@ exports[`TagsDialog dialog component tests should render dialog 1`] = `
                     <label
                       class="c12"
                       data-testid="formgroup-title"
-                      titleoffset="0"
-                      titlesize="4"
                     >
                       Value
                     </label>
                     <div
                       class="c13 c14"
                       data-testid="formgroup-content"
-                      size="8"
                     />
                   </div>
                   <div
@@ -1423,15 +1404,12 @@ exports[`TagsDialog dialog component tests should render dialog 1`] = `
                     <label
                       class="c12"
                       data-testid="formgroup-title"
-                      titleoffset="0"
-                      titlesize="4"
                     >
                       Comment
                     </label>
                     <div
                       class="c13 c14"
                       data-testid="formgroup-content"
-                      size="8"
                     />
                   </div>
                 </div>
diff --git a/src/web/entities/filterprovider.js b/src/web/entities/filterprovider.js
index 5fc89048f0..0c353d9bd8 100644
--- a/src/web/entities/filterprovider.js
+++ b/src/web/entities/filterprovider.js
@@ -53,12 +53,15 @@ const FilterProvider = ({
 
   let returnedFilter;
 
-  const [defaultSettingFilter, defaultSettingsFilterError] = useSelector(
-    state => {
-      const defaultFilterSel = getUserSettingsDefaultFilter(state, gmpname);
-      return [defaultFilterSel.getFilter(), defaultFilterSel.getError()];
-    },
-  );
+  const defaultSettingFilter = useSelector(state => {
+    const defaultFilterSel = getUserSettingsDefaultFilter(state, gmpname);
+    return defaultFilterSel.getFilter();
+  });
+
+  const defaultSettingsFilterError = useSelector(state => {
+    const defaultFilterSel = getUserSettingsDefaultFilter(state, gmpname);
+    return defaultFilterSel.getError();
+  });
 
   useEffect(() => {
     if (
diff --git a/src/web/entities/table.js b/src/web/entities/table.js
index efc4eb22c9..641b6245b2 100644
--- a/src/web/entities/table.js
+++ b/src/web/entities/table.js
@@ -41,6 +41,7 @@ import StripedTable from 'web/components/table/stripedtable';
 import PropTypes from 'web/utils/proptypes';
 
 import withComponentDefaults from 'web/utils/withComponentDefaults';
+import {excludePropsConfig} from 'web/utils/styledConfig';
 
 const exclude_props = [
   'row',
@@ -51,7 +52,9 @@ const exclude_props = [
   'children',
 ];
 
-const UpdatingStripedTable = styled(StripedTable)`
+const UpdatingStripedTable = styled(StripedTable).withConfig(
+  excludePropsConfig(['isUpdating']),
+)`
   opacity: ${props => (props.isUpdating ? '0.2' : '1.0')};
 `;
 
@@ -214,9 +217,7 @@ class EntitiesTable extends React.Component {
     }
 
     const pagination =
-      PaginationComponent === false ? (
-        undefined
-      ) : (
+      PaginationComponent === false ? undefined : (
         <PaginationComponent
           {...other}
           onFirstClick={this.handleFirst}
@@ -228,9 +229,7 @@ class EntitiesTable extends React.Component {
       );
 
     const header =
-      !isDefined(HeaderComponent) || HeaderComponent === false ? (
-        undefined
-      ) : (
+      !isDefined(HeaderComponent) || HeaderComponent === false ? undefined : (
         <HeaderComponent
           currentSortBy={currentSortBy}
           currentSortDir={currentSortDir}
@@ -239,9 +238,7 @@ class EntitiesTable extends React.Component {
       );
 
     const footer =
-      !isDefined(FooterComponent) || FooterComponent === false ? (
-        undefined
-      ) : (
+      !isDefined(FooterComponent) || FooterComponent === false ? undefined : (
         <FooterComponent {...other} />
       );
 
diff --git a/src/web/entity/permissions.js b/src/web/entity/permissions.js
index 0ef4b2aff6..d2141f0f50 100644
--- a/src/web/entity/permissions.js
+++ b/src/web/entity/permissions.js
@@ -81,12 +81,10 @@ class Permissions extends React.Component {
 
     this.handleChange = this.handleChange.bind(this);
     this.handleMultipleSave = this.handleMultipleSave.bind(this);
-    this.openMultiplePermissionDialog = this.openMultiplePermissionDialog.bind(
-      this,
-    );
-    this.handleCloseMultiplePermissionDialog = this.handleCloseMultiplePermissionDialog.bind(
-      this,
-    );
+    this.openMultiplePermissionDialog =
+      this.openMultiplePermissionDialog.bind(this);
+    this.handleCloseMultiplePermissionDialog =
+      this.handleCloseMultiplePermissionDialog.bind(this);
     this.openPermissionDialog = this.openPermissionDialog.bind(this);
   }
 
@@ -306,7 +304,7 @@ EntityPermissions.propTypes = {
   permissions: PropTypes.array,
   relatedResourcesLoaders: PropTypes.arrayOf(PropTypes.func),
   onChanged: PropTypes.func.isRequired,
-  onDownloaded: PropTypes.func.isRequired,
+  onDownloaded: PropTypes.func,
   onError: PropTypes.func.isRequired,
   onInteraction: PropTypes.func.isRequired,
 };
diff --git a/src/web/pages/audits/__tests__/__snapshots__/actions.js.snap b/src/web/pages/audits/__tests__/__snapshots__/actions.js.snap
index 76cc3907fd..33e293e7ed 100644
--- a/src/web/pages/audits/__tests__/__snapshots__/actions.js.snap
+++ b/src/web/pages/audits/__tests__/__snapshots__/actions.js.snap
@@ -128,7 +128,6 @@ exports[`Audit Actions tests should render 1`] = `
         >
           <div
             class="c3 c4"
-            margin="5px"
           >
             <span
               class="c5 c6 c7"
diff --git a/src/web/pages/audits/__tests__/__snapshots__/details.js.snap b/src/web/pages/audits/__tests__/__snapshots__/details.js.snap
index e36b9aa382..cf3ce381cc 100644
--- a/src/web/pages/audits/__tests__/__snapshots__/details.js.snap
+++ b/src/web/pages/audits/__tests__/__snapshots__/details.js.snap
@@ -155,7 +155,6 @@ exports[`Audit Details tests should render full audit details 1`] = `
       >
         <div
           class="c3 c5 c6"
-          margin="5px"
         >
           <span>
             <a
diff --git a/src/web/pages/audits/__tests__/__snapshots__/detailspage.js.snap b/src/web/pages/audits/__tests__/__snapshots__/detailspage.js.snap
index 926fbf8c4d..c94910fbe2 100644
--- a/src/web/pages/audits/__tests__/__snapshots__/detailspage.js.snap
+++ b/src/web/pages/audits/__tests__/__snapshots__/detailspage.js.snap
@@ -375,6 +375,10 @@ exports[`Audit Detailspage tests should render full Detailspage 1`] = `
   border-top: 2px solid #11ab51;
 }
 
+.c29 :hover {
+  border-top: 2px solid #fff;
+}
+
 .c29 :first-child {
   border-left: 1px solid #e5e5e5;
 }
@@ -603,14 +607,12 @@ exports[`Audit Detailspage tests should render full Detailspage 1`] = `
     >
       <div
         class="c2 c4"
-        margin="10px"
       >
         <div
           class="c2 c3"
         >
           <div
             class="c5 c6"
-            margin="5px"
           >
             <a
               href="test/en/compliance-and-special-scans.html#configuring-and-managing-audits"
@@ -620,7 +622,6 @@ exports[`Audit Detailspage tests should render full Detailspage 1`] = `
               <span
                 class="c7 c8"
                 data-testid="svg-icon"
-                iconsize="small"
                 title="Help: Audits"
               >
                 <svg
@@ -637,7 +638,6 @@ exports[`Audit Detailspage tests should render full Detailspage 1`] = `
               <span
                 class="c7 c8"
                 data-testid="svg-icon"
-                iconsize="small"
                 title="Audit List"
               >
                 <svg
@@ -650,7 +650,6 @@ exports[`Audit Detailspage tests should render full Detailspage 1`] = `
             <span
               class="c7 c8"
               data-testid="svg-icon"
-              iconsize="small"
               title="This is an Alterable Audit. Reports may not relate to current Policy or Target!"
             >
               <svg
@@ -666,12 +665,10 @@ exports[`Audit Detailspage tests should render full Detailspage 1`] = `
         >
           <div
             class="c2 c6"
-            margin="5px"
           >
             <span
               class="c7 c10 c8"
               data-testid="svg-icon"
-              iconsize="small"
               title="Clone Audit"
             >
               <svg
@@ -683,7 +680,6 @@ exports[`Audit Detailspage tests should render full Detailspage 1`] = `
             <span
               class="c7 c10 c8"
               data-testid="svg-icon"
-              iconsize="small"
               title="Edit Audit"
             >
               <svg
@@ -695,7 +691,6 @@ exports[`Audit Detailspage tests should render full Detailspage 1`] = `
             <span
               class="c7 c10 c8"
               data-testid="svg-icon"
-              iconsize="small"
               title="Move Audit to trashcan"
             >
               <svg
@@ -707,7 +702,6 @@ exports[`Audit Detailspage tests should render full Detailspage 1`] = `
             <span
               class="c7 c10 c8"
               data-testid="svg-icon"
-              iconsize="small"
               title="Export Audit as XML"
             >
               <svg
@@ -723,12 +717,10 @@ exports[`Audit Detailspage tests should render full Detailspage 1`] = `
         >
           <div
             class="c2 c6"
-            margin="5px"
           >
             <span
               class="c7 c10 c8"
               data-testid="svg-icon"
-              iconsize="small"
               title="Start"
             >
               <svg
@@ -741,7 +733,6 @@ exports[`Audit Detailspage tests should render full Detailspage 1`] = `
               alt="Resume"
               class="c7 c11 c8"
               data-testid="svg-icon"
-              iconsize="small"
               title="Audit is not stopped"
             >
               <svg
@@ -757,14 +748,12 @@ exports[`Audit Detailspage tests should render full Detailspage 1`] = `
         >
           <div
             class="c2 c4"
-            margin="10px"
           >
             <div
               class="c2 c3"
             >
               <div
                 class="c2 c6"
-                margin="5px"
               >
                 <a
                   class="c9"
@@ -775,7 +764,6 @@ exports[`Audit Detailspage tests should render full Detailspage 1`] = `
                   <span
                     class="c7 c8"
                     data-testid="svg-icon"
-                    iconsize="small"
                   >
                     <svg>
                       report.svg
@@ -789,12 +777,10 @@ exports[`Audit Detailspage tests should render full Detailspage 1`] = `
                 >
                   <div
                     class="c12"
-                    margin="0"
                   >
                     <span
                       class="c7 c8"
                       data-testid="svg-icon"
-                      iconsize="small"
                     >
                       <svg>
                         report.svg
@@ -803,7 +789,6 @@ exports[`Audit Detailspage tests should render full Detailspage 1`] = `
                     <span
                       class="c13"
                       data-testid="badge-icon"
-                      margin="0"
                     >
                       1
                     </span>
@@ -818,12 +803,10 @@ exports[`Audit Detailspage tests should render full Detailspage 1`] = `
             >
               <div
                 class="c12"
-                margin="0"
               >
                 <span
                   class="c7 c8"
                   data-testid="svg-icon"
-                  iconsize="small"
                 >
                   <svg>
                     result.svg
@@ -832,7 +815,6 @@ exports[`Audit Detailspage tests should render full Detailspage 1`] = `
                 <span
                   class="c13"
                   data-testid="badge-icon"
-                  margin="0"
                 >
                   1
                 </span>
@@ -1028,7 +1010,6 @@ exports[`Audit Detailspage tests should render full Detailspage 1`] = `
                     href="/report/1234"
                   >
                     <div
-                      boxbackground="#4C4C4C"
                       class="c39"
                       data-testid="progressbar-box"
                       title="Done"
@@ -1037,7 +1018,6 @@ exports[`Audit Detailspage tests should render full Detailspage 1`] = `
                         background="low"
                         class="c40"
                         data-testid="progress"
-                        progress="100"
                       />
                       <div
                         class="c41"
@@ -1086,7 +1066,6 @@ exports[`Audit Detailspage tests should render full Detailspage 1`] = `
               >
                 <div
                   class="c2 c6 c43"
-                  margin="5px"
                 >
                   <span>
                     <a
@@ -1434,14 +1413,12 @@ exports[`Audit ToolBarIcons tests should render 1`] = `
 >
   <div
     class="c0 c2"
-    margin="10px"
   >
     <div
       class="c0 c1"
     >
       <div
         class="c3 c4"
-        margin="5px"
       >
         <a
           href="test/en/compliance-and-special-scans.html#configuring-and-managing-audits"
@@ -1494,7 +1471,6 @@ exports[`Audit ToolBarIcons tests should render 1`] = `
     >
       <div
         class="c0 c4"
-        margin="5px"
       >
         <span
           class="c5 c8 c6"
@@ -1547,7 +1523,6 @@ exports[`Audit ToolBarIcons tests should render 1`] = `
     >
       <div
         class="c0 c4"
-        margin="5px"
       >
         <span
           class="c5 c8 c6"
@@ -1579,14 +1554,12 @@ exports[`Audit ToolBarIcons tests should render 1`] = `
     >
       <div
         class="c0 c2"
-        margin="10px"
       >
         <div
           class="c0 c1"
         >
           <div
             class="c0 c4"
-            margin="5px"
           >
             <a
               class="c7"
@@ -1610,7 +1583,6 @@ exports[`Audit ToolBarIcons tests should render 1`] = `
             >
               <div
                 class="c10"
-                margin="0"
               >
                 <span
                   class="c5 c6"
@@ -1623,7 +1595,6 @@ exports[`Audit ToolBarIcons tests should render 1`] = `
                 <span
                   class="c11"
                   data-testid="badge-icon"
-                  margin="0"
                 >
                   1
                 </span>
@@ -1638,7 +1609,6 @@ exports[`Audit ToolBarIcons tests should render 1`] = `
         >
           <div
             class="c10"
-            margin="0"
           >
             <span
               class="c5 c6"
@@ -1651,7 +1621,6 @@ exports[`Audit ToolBarIcons tests should render 1`] = `
             <span
               class="c11"
               data-testid="badge-icon"
-              margin="0"
             >
               1
             </span>
diff --git a/src/web/pages/audits/__tests__/__snapshots__/listpage.js.snap b/src/web/pages/audits/__tests__/__snapshots__/listpage.js.snap
index 8ec49fb586..188cc5a3ef 100644
--- a/src/web/pages/audits/__tests__/__snapshots__/listpage.js.snap
+++ b/src/web/pages/audits/__tests__/__snapshots__/listpage.js.snap
@@ -67,7 +67,6 @@ exports[`AuditPage ToolBarIcons test should render 1`] = `
 >
   <div
     class="c0 c2"
-    margin="5px"
   >
     <a
       href="test/en/compliance-and-special-scans.html#configuring-and-managing-audits"
@@ -875,7 +874,7 @@ exports[`AuditPage tests should render full AuditPage 1`] = `
   .c44 {
     color: #000;
     font-size: 1.2em;
-    background-color: none;
+    background-color: transparent;
     font-weight: bold;
   }
 }
@@ -884,7 +883,7 @@ exports[`AuditPage tests should render full AuditPage 1`] = `
   .c46 {
     color: #000;
     font-size: 1.2em;
-    background-color: none;
+    background-color: transparent;
     font-weight: bold;
   }
 }
@@ -893,7 +892,7 @@ exports[`AuditPage tests should render full AuditPage 1`] = `
   .c47 {
     color: #000;
     font-size: 1.2em;
-    background-color: none;
+    background-color: transparent;
     font-weight: bold;
   }
 }
@@ -902,7 +901,7 @@ exports[`AuditPage tests should render full AuditPage 1`] = `
   .c48 {
     color: #000;
     font-size: 1.2em;
-    background-color: none;
+    background-color: transparent;
     font-weight: bold;
   }
 }
@@ -967,7 +966,6 @@ exports[`AuditPage tests should render full AuditPage 1`] = `
         >
           <div
             class="c2 c4"
-            margin="5px"
           >
             <a
               href="test/en/compliance-and-special-scans.html#configuring-and-managing-audits"
@@ -977,7 +975,6 @@ exports[`AuditPage tests should render full AuditPage 1`] = `
               <span
                 class="c5 c6"
                 data-testid="svg-icon"
-                iconsize="small"
                 title="Help: Audits"
               >
                 <svg
@@ -990,7 +987,6 @@ exports[`AuditPage tests should render full AuditPage 1`] = `
             <span
               class="c5 c7 c6"
               data-testid="svg-icon"
-              iconsize="small"
               title="New Audit"
             >
               <svg
@@ -1015,7 +1011,6 @@ exports[`AuditPage tests should render full AuditPage 1`] = `
               >
                 <div
                   class="c11 c4 c12"
-                  margin="5px"
                 >
                   <div
                     class="c11"
@@ -1047,12 +1042,10 @@ exports[`AuditPage tests should render full AuditPage 1`] = `
                   >
                     <div
                       class="c11 c4"
-                      margin="5px"
                     >
                       <span
                         class="c5 c7 c6"
                         data-testid="svg-icon"
-                        iconsize="small"
                         title="Update Filter"
                       >
                         <svg
@@ -1064,7 +1057,6 @@ exports[`AuditPage tests should render full AuditPage 1`] = `
                       <span
                         class="c5 c7 c6"
                         data-testid="svg-icon"
-                        iconsize="small"
                         title="Remove Filter"
                       >
                         <svg
@@ -1076,7 +1068,6 @@ exports[`AuditPage tests should render full AuditPage 1`] = `
                       <span
                         class="c5 c7 c6"
                         data-testid="svg-icon"
-                        iconsize="small"
                         title="Reset to Default Filter"
                       >
                         <svg
@@ -1093,7 +1084,6 @@ exports[`AuditPage tests should render full AuditPage 1`] = `
                         <span
                           class="c5 c6"
                           data-testid="svg-icon"
-                          iconsize="small"
                           title="Help: Powerfilter"
                         >
                           <svg
@@ -1140,7 +1130,6 @@ exports[`AuditPage tests should render full AuditPage 1`] = `
                       <span
                         class="c23 c24"
                         data-testid="select-open-button"
-                        iconsize="small"
                       >
                         ▼
                       </span>
@@ -1217,7 +1206,6 @@ exports[`AuditPage tests should render full AuditPage 1`] = `
                 >
                   <div
                     class="c2 c4"
-                    margin="5px"
                   >
                     <span
                       class="c5 c38 c6"
@@ -1253,7 +1241,6 @@ exports[`AuditPage tests should render full AuditPage 1`] = `
                 >
                   <div
                     class="c2 c4"
-                    margin="5px"
                   >
                     <span
                       class="c5 c38 c6"
@@ -1369,7 +1356,6 @@ exports[`AuditPage tests should render full AuditPage 1`] = `
                         >
                           <div
                             class="c2 c4"
-                            margin="5px"
                           />
                         </div>
                       </div>
@@ -1392,7 +1378,6 @@ exports[`AuditPage tests should render full AuditPage 1`] = `
                         href="/report/1234"
                       >
                         <div
-                          boxbackground="#4C4C4C"
                           class="c55"
                           data-testid="progressbar-box"
                           title="Done"
@@ -1401,7 +1386,6 @@ exports[`AuditPage tests should render full AuditPage 1`] = `
                             background="low"
                             class="c56"
                             data-testid="progress"
-                            progress="100"
                           />
                           <div
                             class="c57"
@@ -1436,7 +1420,6 @@ exports[`AuditPage tests should render full AuditPage 1`] = `
                       class="c50"
                     >
                       <div
-                        boxbackground="#c83814"
                         class="c59"
                         data-testid="progressbar-box"
                         title="50%"
@@ -1445,7 +1428,6 @@ exports[`AuditPage tests should render full AuditPage 1`] = `
                           background="#70c000"
                           class="c60"
                           data-testid="progress"
-                          progress="50"
                         />
                         <div
                           class="c57"
@@ -1464,7 +1446,6 @@ exports[`AuditPage tests should render full AuditPage 1`] = `
                       >
                         <div
                           class="c62 c4"
-                          margin="5px"
                         >
                           <span
                             class="c5 c7 c6"
@@ -1563,7 +1544,6 @@ exports[`AuditPage tests should render full AuditPage 1`] = `
                       >
                         <div
                           class="c2 c4"
-                          margin="5px"
                         >
                           <div
                             aria-expanded="false"
@@ -1615,7 +1595,6 @@ exports[`AuditPage tests should render full AuditPage 1`] = `
                           >
                             <div
                               class="c2 c4"
-                              margin="5px"
                             >
                               <span
                                 class="c5 c7 c6"
@@ -1664,7 +1643,6 @@ exports[`AuditPage tests should render full AuditPage 1`] = `
                 >
                   <div
                     class="c2 c4"
-                    margin="5px"
                   >
                     <span
                       class="c5 c38 c6"
@@ -1700,7 +1678,6 @@ exports[`AuditPage tests should render full AuditPage 1`] = `
                 >
                   <div
                     class="c2 c4"
-                    margin="5px"
                   >
                     <span
                       class="c5 c38 c6"
diff --git a/src/web/pages/audits/__tests__/__snapshots__/row.js.snap b/src/web/pages/audits/__tests__/__snapshots__/row.js.snap
index a528ef260e..7a69513ca3 100644
--- a/src/web/pages/audits/__tests__/__snapshots__/row.js.snap
+++ b/src/web/pages/audits/__tests__/__snapshots__/row.js.snap
@@ -297,7 +297,6 @@ exports[`Audit Row tests should render 1`] = `
             >
               <div
                 class="c3 c5"
-                margin="5px"
               />
             </div>
           </div>
@@ -320,7 +319,6 @@ exports[`Audit Row tests should render 1`] = `
             href="/report/1234"
           >
             <div
-              boxbackground="#4C4C4C"
               class="c8"
               data-testid="progressbar-box"
               title="Done"
@@ -329,7 +327,6 @@ exports[`Audit Row tests should render 1`] = `
                 background="low"
                 class="c9"
                 data-testid="progress"
-                progress="100"
               />
               <div
                 class="c10"
@@ -364,7 +361,6 @@ exports[`Audit Row tests should render 1`] = `
           class="c0"
         >
           <div
-            boxbackground="#c83814"
             class="c12"
             data-testid="progressbar-box"
             title="50%"
@@ -373,7 +369,6 @@ exports[`Audit Row tests should render 1`] = `
               background="#70c000"
               class="c13"
               data-testid="progress"
-              progress="50"
             />
             <div
               class="c10"
@@ -392,7 +387,6 @@ exports[`Audit Row tests should render 1`] = `
           >
             <div
               class="c16 c5"
-              margin="5px"
             >
               <span
                 class="c17 c18 c19"
diff --git a/src/web/pages/audits/__tests__/__snapshots__/table.js.snap b/src/web/pages/audits/__tests__/__snapshots__/table.js.snap
index dde9cced01..55350aab47 100644
--- a/src/web/pages/audits/__tests__/__snapshots__/table.js.snap
+++ b/src/web/pages/audits/__tests__/__snapshots__/table.js.snap
@@ -554,7 +554,7 @@ exports[`Audits table tests should render 1`] = `
   .c18 {
     color: #000;
     font-size: 1.2em;
-    background-color: none;
+    background-color: transparent;
     font-weight: bold;
   }
 }
@@ -563,7 +563,7 @@ exports[`Audits table tests should render 1`] = `
   .c19 {
     color: #000;
     font-size: 1.2em;
-    background-color: none;
+    background-color: transparent;
     font-weight: bold;
   }
 }
@@ -572,7 +572,7 @@ exports[`Audits table tests should render 1`] = `
   .c20 {
     color: #000;
     font-size: 1.2em;
-    background-color: none;
+    background-color: transparent;
     font-weight: bold;
   }
 }
@@ -581,7 +581,7 @@ exports[`Audits table tests should render 1`] = `
   .c21 {
     color: #000;
     font-size: 1.2em;
-    background-color: none;
+    background-color: transparent;
     font-weight: bold;
   }
 }
@@ -672,7 +672,6 @@ exports[`Audits table tests should render 1`] = `
           >
             <div
               class="c9 c11"
-              margin="5px"
             >
               <span
                 class="c3 c12 c5"
@@ -708,7 +707,6 @@ exports[`Audits table tests should render 1`] = `
           >
             <div
               class="c9 c11"
-              margin="5px"
             >
               <span
                 class="c3 c12 c5"
@@ -812,7 +810,6 @@ exports[`Audits table tests should render 1`] = `
                   >
                     <div
                       class="c9 c11"
-                      margin="5px"
                     />
                   </div>
                 </div>
@@ -835,7 +832,6 @@ exports[`Audits table tests should render 1`] = `
                   href="/report/1234"
                 >
                   <div
-                    boxbackground="#4C4C4C"
                     class="c28"
                     data-testid="progressbar-box"
                     title="Done"
@@ -844,7 +840,6 @@ exports[`Audits table tests should render 1`] = `
                       background="low"
                       class="c29"
                       data-testid="progress"
-                      progress="100"
                     />
                     <div
                       class="c30"
@@ -879,7 +874,6 @@ exports[`Audits table tests should render 1`] = `
                 class="c23"
               >
                 <div
-                  boxbackground="#c83814"
                   class="c32"
                   data-testid="progressbar-box"
                   title="50%"
@@ -888,7 +882,6 @@ exports[`Audits table tests should render 1`] = `
                     background="#70c000"
                     class="c33"
                     data-testid="progress"
-                    progress="50"
                   />
                   <div
                     class="c30"
@@ -907,7 +900,6 @@ exports[`Audits table tests should render 1`] = `
                 >
                   <div
                     class="c35 c11"
-                    margin="5px"
                   >
                     <span
                       class="c3 c4 c5"
@@ -1011,7 +1003,6 @@ exports[`Audits table tests should render 1`] = `
                   >
                     <div
                       class="c9 c11"
-                      margin="5px"
                     >
                       <span
                         alt="Audit owned by user"
@@ -1045,7 +1036,6 @@ exports[`Audits table tests should render 1`] = `
                   class="c26 c27"
                 >
                   <div
-                    boxbackground="#4C4C4C"
                     class="c28"
                     data-testid="progressbar-box"
                     title="New"
@@ -1054,7 +1044,6 @@ exports[`Audits table tests should render 1`] = `
                       background="new"
                       class="c36"
                       data-testid="progress"
-                      progress="100"
                     />
                     <div
                       class="c30"
@@ -1088,7 +1077,6 @@ exports[`Audits table tests should render 1`] = `
                 >
                   <div
                     class="c35 c11"
-                    margin="5px"
                   >
                     <span
                       class="c3 c4 c5"
@@ -1192,7 +1180,6 @@ exports[`Audits table tests should render 1`] = `
                   >
                     <div
                       class="c9 c11"
-                      margin="5px"
                     >
                       <span
                         alt="Audit owned by user"
@@ -1228,7 +1215,6 @@ exports[`Audits table tests should render 1`] = `
                   href="/report/5678"
                 >
                   <div
-                    boxbackground="#4C4C4C"
                     class="c28"
                     data-testid="progressbar-box"
                     title="Running"
@@ -1237,7 +1223,6 @@ exports[`Audits table tests should render 1`] = `
                       background="run"
                       class="c37"
                       data-testid="progress"
-                      progress="0"
                     />
                     <div
                       class="c30"
@@ -1272,7 +1257,6 @@ exports[`Audits table tests should render 1`] = `
                 class="c23"
               >
                 <div
-                  boxbackground="#c83814"
                   class="c32"
                   data-testid="progressbar-box"
                   title="50%"
@@ -1281,7 +1265,6 @@ exports[`Audits table tests should render 1`] = `
                     background="#70c000"
                     class="c33"
                     data-testid="progress"
-                    progress="50"
                   />
                   <div
                     class="c30"
@@ -1300,7 +1283,6 @@ exports[`Audits table tests should render 1`] = `
                 >
                   <div
                     class="c35 c11"
-                    margin="5px"
                   >
                     <span
                       class="c3 c4 c5"
@@ -1399,7 +1381,6 @@ exports[`Audits table tests should render 1`] = `
                 >
                   <div
                     class="c9 c11"
-                    margin="5px"
                   >
                     <div
                       aria-expanded="false"
@@ -1448,7 +1429,6 @@ exports[`Audits table tests should render 1`] = `
                     >
                       <div
                         class="c9 c11"
-                        margin="5px"
                       >
                         <span
                           class="c3 c5"
@@ -1491,7 +1471,6 @@ exports[`Audits table tests should render 1`] = `
           >
             <div
               class="c9 c11"
-              margin="5px"
             >
               <span
                 class="c3 c12 c5"
@@ -1527,7 +1506,6 @@ exports[`Audits table tests should render 1`] = `
           >
             <div
               class="c9 c11"
-              margin="5px"
             >
               <span
                 class="c3 c12 c5"
diff --git a/src/web/pages/audits/component.js b/src/web/pages/audits/component.js
index 8d2245ea4a..f2671b5c04 100644
--- a/src/web/pages/audits/component.js
+++ b/src/web/pages/audits/component.js
@@ -574,7 +574,7 @@ AuditComponent.propTypes = {
   loadTargets: PropTypes.func.isRequired,
   loadUserSettingsDefaults: PropTypes.func.isRequired,
   policies: PropTypes.arrayOf(PropTypes.model),
-  reportExportFileName: PropTypes.object,
+  reportExportFileName: PropTypes.string,
   reportFormats: PropTypes.array,
   scanners: PropTypes.arrayOf(PropTypes.model),
   schedules: PropTypes.arrayOf(PropTypes.model),
diff --git a/src/web/pages/certbund/detailspage.js b/src/web/pages/certbund/detailspage.js
index 19abbb839c..81159c9b8b 100644
--- a/src/web/pages/certbund/detailspage.js
+++ b/src/web/pages/certbund/detailspage.js
@@ -160,7 +160,7 @@ const Details = ({entity}) => {
         <DetailsBlock title={_('Other Links')}>
           <ul>
             {additionalInformation.map(info => (
-              <li key={info.url}>
+              <li key={info.url + '-' + info.issuer}>
                 <Layout flex="column">
                   <b>{info.issuer}</b>
                   <span>
diff --git a/src/web/pages/credentials/component.js b/src/web/pages/credentials/component.js
index cabfd63a56..d84a6b9cc1 100644
--- a/src/web/pages/credentials/component.js
+++ b/src/web/pages/credentials/component.js
@@ -48,9 +48,8 @@ class CredentialsComponent extends React.Component {
 
     this.state = {dialogVisible: false};
 
-    this.handleCloseCredentialDialog = this.handleCloseCredentialDialog.bind(
-      this,
-    );
+    this.handleCloseCredentialDialog =
+      this.handleCloseCredentialDialog.bind(this);
     this.openCredentialsDialog = this.openCredentialsDialog.bind(this);
     this.handleDownloadInstaller = this.handleDownloadInstaller.bind(this);
   }
@@ -119,13 +118,8 @@ class CredentialsComponent extends React.Component {
     return gmp.credential
       .download(credential, format)
       .then(response => {
-        const {
-          creationTime,
-          entityType,
-          id,
-          modificationTime,
-          name,
-        } = credential;
+        const {creationTime, entityType, id, modificationTime, name} =
+          credential;
         const filename = generateFilename({
           creationTime: creationTime,
           extension: format,
@@ -209,7 +203,7 @@ class CredentialsComponent extends React.Component {
 
 CredentialsComponent.propTypes = {
   children: PropTypes.func.isRequired,
-  detailsExportFileName: PropTypes.object,
+  detailsExportFileName: PropTypes.string,
   gmp: PropTypes.gmp.isRequired,
   username: PropTypes.string,
   onCloneError: PropTypes.func,
@@ -246,10 +240,7 @@ const mapDispatchToProps = (dispatch, {gmp}) => ({
 
 export default compose(
   withGmp,
-  connect(
-    mapStateToProps,
-    mapDispatchToProps,
-  ),
+  connect(mapStateToProps, mapDispatchToProps),
 )(CredentialsComponent);
 
 // vim: set ts=2 sw=2 tw=80:
diff --git a/src/web/pages/credentials/dialog.js b/src/web/pages/credentials/dialog.js
index 16365bc971..c509f52106 100644
--- a/src/web/pages/credentials/dialog.js
+++ b/src/web/pages/credentials/dialog.js
@@ -68,9 +68,8 @@ class CredentialsDialog extends React.Component {
 
     this.state = {};
 
-    this.handleCredentialTypeChange = this.handleCredentialTypeChange.bind(
-      this,
-    );
+    this.handleCredentialTypeChange =
+      this.handleCredentialTypeChange.bind(this);
     this.handlePublicKeyChange = this.handlePublicKeyChange.bind(this);
     this.handleErrorClose = this.handleErrorClose.bind(this);
     this.handleError = this.handleError.bind(this);
@@ -83,6 +82,7 @@ class CredentialsDialog extends React.Component {
         error: error,
       };
     }
+    return null;
   }
 
   componentDidMount() {
diff --git a/src/web/pages/cves/__tests__/listpage.js b/src/web/pages/cves/__tests__/listpage.js
index 3fd5ccb58d..5c7a135182 100644
--- a/src/web/pages/cves/__tests__/listpage.js
+++ b/src/web/pages/cves/__tests__/listpage.js
@@ -20,6 +20,7 @@ import React from 'react';
 import CollectionCounts from 'gmp/collection/collectioncounts';
 
 import {setLocale} from 'gmp/locale/lang';
+import {parseDate} from 'gmp/parser';
 
 import Filter from 'gmp/models/filter';
 import Cve from 'gmp/models/cve';
@@ -42,7 +43,7 @@ const cve = Cve.fromElement({
   _id: 'CVE-2020-9992',
   name: 'CVE-2020-9992',
   cvss_vector: 'AV:N/AC:M/Au:N/C:C/I:C/A:C',
-  creationTime: '2020-10-22T19:15:00Z',
+  creationTime: parseDate('2020-10-22T19:15:00Z'),
   severity: '9.3',
   description: 'foo bar baz',
   usage_type: 'cve',
diff --git a/src/web/pages/cves/__tests__/row.js b/src/web/pages/cves/__tests__/row.js
index 8b3095f38d..c0acec2db6 100644
--- a/src/web/pages/cves/__tests__/row.js
+++ b/src/web/pages/cves/__tests__/row.js
@@ -20,6 +20,7 @@ import React from 'react';
 
 import Capabilities from 'gmp/capabilities/capabilities';
 import {setLocale} from 'gmp/locale/lang';
+import {parseDate} from 'gmp/parser';
 
 import Cve from 'gmp/models/cve';
 
@@ -38,7 +39,7 @@ const entity = Cve.fromElement({
   _id: 'CVE-2020-9992',
   name: 'CVE-2020-9992',
   cvss_vector: 'AV:N/AC:M/Au:N/C:C/I:C/A:C',
-  creationTime: '2020-10-22T19:15:00Z',
+  creationTime: parseDate('2020-10-22T19:15:00Z'),
   severity: '9.3',
   description: 'foo bar baz',
   usage_type: 'cve',
diff --git a/src/web/pages/cves/__tests__/table.js b/src/web/pages/cves/__tests__/table.js
index c5b02c4597..4e0cff15c7 100644
--- a/src/web/pages/cves/__tests__/table.js
+++ b/src/web/pages/cves/__tests__/table.js
@@ -20,6 +20,7 @@ import React from 'react';
 import Capabilities from 'gmp/capabilities/capabilities';
 import CollectionCounts from 'gmp/collection/collectioncounts';
 import {setLocale} from 'gmp/locale/lang';
+import {parseDate} from 'gmp/parser';
 
 import Filter from 'gmp/models/filter';
 import Cve from 'gmp/models/cve';
@@ -38,7 +39,7 @@ const entity = Cve.fromElement({
   _id: 'CVE-2020-9992',
   name: 'CVE-2020-9992',
   cvss_vector: 'AV:N/AC:M/Au:N/C:C/I:C/A:C',
-  creationTime: '2020-10-22T19:15:00Z',
+  creationTime: parseDate('2020-10-22T19:15:00Z'),
   score: '93',
   description: 'foo bar baz',
   usage_type: 'cve',
@@ -48,7 +49,7 @@ const entity2 = Cve.fromElement({
   _id: 'CVE-2020-9983',
   name: 'CVE-2020-9983',
   cvss_vector: 'AV:N/AC:M/Au:N/C:P/I:P/A:P',
-  creationTime: '2019-06-24T10:12:27Z',
+  creationTime: parseDate('2019-06-24T10:12:27Z'),
   score: '93',
   description: 'foo bar baz',
   usage_type: 'cve',
@@ -58,7 +59,7 @@ const entity3 = Cve.fromElement({
   _id: 'CVE-2020-9976',
   name: 'CVE-2020-9976',
   cvss_vector: 'AV:N/AC:M/Au:N/C:P/I:P/A:P',
-  creationTime: '2020-09-10T12:51:27Z',
+  creationTime: parseDate('2020-09-10T12:51:27Z'),
   score: '93',
   description: 'foo bar baz',
   usage_type: 'cve',
@@ -68,7 +69,7 @@ const entity_v3 = Cve.fromElement({
   _id: 'CVE-2020-9997',
   name: 'CVE-2020-9997',
   cvss_vector: 'CVSS:3.1/AV:L/AC:L/PR:N/UI:R/S:U/C:N/I:H/A:H',
-  creationTime: '2020-10-22T19:15:00Z',
+  creationTime: parseDate('2020-10-22T19:15:00Z'),
   score: '71',
   description: 'foo bar baz',
   usage_type: 'cve',
diff --git a/src/web/pages/cves/row.js b/src/web/pages/cves/row.js
index 4c41bd9906..64be99fb7d 100644
--- a/src/web/pages/cves/row.js
+++ b/src/web/pages/cves/row.js
@@ -28,7 +28,6 @@ import DateTime from 'web/components/date/datetime';
 
 import Link from 'web/components/link/link';
 
-import TableBody from 'web/components/table/body';
 import TableRow from 'web/components/table/row';
 import TableData from 'web/components/table/data';
 
@@ -44,31 +43,29 @@ const Row = ({
   onToggleDetailsClick,
   ...props
 }) => (
-  <TableBody>
-    <TableRow>
-      <TableData>
-        <span>
-          <RowDetailsToggle name={entity.id} onClick={onToggleDetailsClick}>
-            {entity.name}
-          </RowDetailsToggle>
-        </span>
-        <Comment text={entity.comment} />
-      </TableData>
-      <TableData>{shorten(entity.description, 160)}</TableData>
-      <TableData>
-        <DateTime date={entity.creationTime} />
-      </TableData>
-      <TableData>
-        <Link to="cvsscalculator" query={{cvssVector: entity.cvssBaseVector}}>
-          {entity.cvssBaseVector}
-        </Link>
-      </TableData>
-      <TableData>
-        <SeverityBar severity={entity.severity} />
-      </TableData>
-      <ActionsComponent {...props} entity={entity} />
-    </TableRow>
-  </TableBody>
+  <TableRow>
+    <TableData>
+      <span>
+        <RowDetailsToggle name={entity.id} onClick={onToggleDetailsClick}>
+          {entity.name}
+        </RowDetailsToggle>
+      </span>
+      <Comment text={entity.comment} />
+    </TableData>
+    <TableData>{shorten(entity.description, 160)}</TableData>
+    <TableData>
+      <DateTime date={entity.creationTime} />
+    </TableData>
+    <TableData>
+      <Link to="cvsscalculator" query={{cvssVector: entity.cvssBaseVector}}>
+        {entity.cvssBaseVector}
+      </Link>
+    </TableData>
+    <TableData>
+      <SeverityBar severity={entity.severity} />
+    </TableData>
+    <ActionsComponent {...props} entity={entity} />
+  </TableRow>
 );
 
 Row.propTypes = {
diff --git a/src/web/pages/cves/table.js b/src/web/pages/cves/table.js
index 8d70914332..de640306e6 100644
--- a/src/web/pages/cves/table.js
+++ b/src/web/pages/cves/table.js
@@ -107,7 +107,6 @@ const CvesFooter = createEntitiesFooter({
 });
 
 export const CvesTable = createEntitiesTable({
-  body: false,
   emptyTitle: _l('No CVEs available'),
   row: CveRow,
   rowDetails: withRowDetails('cve')(CveDetails),
diff --git a/src/web/pages/hosts/identifiers.js b/src/web/pages/hosts/identifiers.js
index bd2d6d4964..c3482ff88e 100644
--- a/src/web/pages/hosts/identifiers.js
+++ b/src/web/pages/hosts/identifiers.js
@@ -40,6 +40,7 @@ import TableHead from 'web/components/table/head';
 import TableRow from 'web/components/table/row';
 
 import DetailsBlock from 'web/entity/block';
+import TableFooter from 'web/components/table/footer';
 
 const Action = styled.a`
   cursor: pointer;
@@ -147,15 +148,19 @@ const Identifiers = props => {
 
   const title = latest ? _('Latest Identifiers') : _('All Identifiers');
   const footer = (
-    <TableRow>
-      <TableData flex align={['center', 'center']} colSpan="5">
-        {!stateEqual && (
-          <Action onClick={handleToggleLatest}>
-            {latest ? _('Show all Identifiers') : _('Show latest Identifiers')}
-          </Action>
-        )}
-      </TableData>
-    </TableRow>
+    <TableFooter>
+      <TableRow>
+        <TableData flex align={['center', 'center']} colSpan="5">
+          {!stateEqual && (
+            <Action onClick={handleToggleLatest}>
+              {latest
+                ? _('Show all Identifiers')
+                : _('Show latest Identifiers')}
+            </Action>
+          )}
+        </TableData>
+      </TableRow>
+    </TableFooter>
   );
 
   displayActions = displayActions && isDefined(onDelete);
diff --git a/src/web/pages/ldap/__tests__/__snapshots__/dialog.js.snap b/src/web/pages/ldap/__tests__/__snapshots__/dialog.js.snap
index d15aaa36c4..34bea120eb 100644
--- a/src/web/pages/ldap/__tests__/__snapshots__/dialog.js.snap
+++ b/src/web/pages/ldap/__tests__/__snapshots__/dialog.js.snap
@@ -536,7 +536,6 @@ exports[`Ldap dialog component tests should render dialog 1`] = `
               <div
                 class="c9"
                 data-testid="save-dialog-content"
-                maxheight="400px"
               >
                 <div
                   class="c10"
@@ -547,15 +546,12 @@ exports[`Ldap dialog component tests should render dialog 1`] = `
                     <label
                       class="c12"
                       data-testid="formgroup-title"
-                      titleoffset="0"
-                      titlesize="2"
                     >
                       Enable
                     </label>
                     <div
                       class="c13 c14"
                       data-testid="formgroup-content"
-                      size="10"
                     >
                       <label
                         class="c15"
@@ -565,7 +561,6 @@ exports[`Ldap dialog component tests should render dialog 1`] = `
                         >
                           <div
                             class="c13 c17"
-                            margin="5px"
                           >
                             <input
                               checked=""
@@ -585,15 +580,12 @@ exports[`Ldap dialog component tests should render dialog 1`] = `
                     <label
                       class="c12"
                       data-testid="formgroup-title"
-                      titleoffset="0"
-                      titlesize="2"
                     >
                       LDAP Host
                     </label>
                     <div
                       class="c13 c14"
                       data-testid="formgroup-content"
-                      size="10"
                     >
                       <input
                         class="c20 c21"
@@ -617,15 +609,12 @@ exports[`Ldap dialog component tests should render dialog 1`] = `
                     <label
                       class="c12"
                       data-testid="formgroup-title"
-                      titleoffset="0"
-                      titlesize="2"
                     >
                       Auth. DN
                     </label>
                     <div
                       class="c13 c14"
                       data-testid="formgroup-content"
-                      size="10"
                     >
                       <input
                         class="c20 c21"
@@ -649,15 +638,12 @@ exports[`Ldap dialog component tests should render dialog 1`] = `
                     <label
                       class="c12"
                       data-testid="formgroup-title"
-                      titleoffset="0"
-                      titlesize="2"
                     >
                       CA Certificate
                     </label>
                     <div
                       class="c13 c14"
                       data-testid="formgroup-content"
-                      size="10"
                     >
                       <div
                         class="c10"
@@ -676,15 +662,12 @@ exports[`Ldap dialog component tests should render dialog 1`] = `
                     <label
                       class="c12"
                       data-testid="formgroup-title"
-                      titleoffset="0"
-                      titlesize="2"
                     >
                       Use LDAPS only
                     </label>
                     <div
                       class="c13 c14"
                       data-testid="formgroup-content"
-                      size="10"
                     >
                       <label
                         class="c15"
@@ -694,7 +677,6 @@ exports[`Ldap dialog component tests should render dialog 1`] = `
                         >
                           <div
                             class="c13 c17"
-                            margin="5px"
                           >
                             <input
                               checked=""
diff --git a/src/web/pages/login/loginform.js b/src/web/pages/login/loginform.js
index 9c17dba250..eb720ce73e 100644
--- a/src/web/pages/login/loginform.js
+++ b/src/web/pages/login/loginform.js
@@ -173,7 +173,7 @@ const LoginForm = ({
                 grow="1"
                 label={_('Username')}
                 value={username}
-                autoFocus="autofocus"
+                autoFocus={true}
                 tabIndex="1"
                 onChange={e => handleValueChange(e.target.value, e.target.name)}
               />
diff --git a/src/web/pages/nvts/__tests__/listpage.js b/src/web/pages/nvts/__tests__/listpage.js
index 38cc78aec4..f17c62d0fb 100644
--- a/src/web/pages/nvts/__tests__/listpage.js
+++ b/src/web/pages/nvts/__tests__/listpage.js
@@ -229,9 +229,9 @@ describe('NvtsPage tests', () => {
         get: getNvts,
         deleteByFilter,
         exportByFilter,
-        getActiveDaysAggregates: getAggregates,
+        getSeverityAggregates: getAggregates,
+        getFamilyAggregates: getAggregates,
         getCreatedAggregates: getAggregates,
-        getWordCountsAggregates: getAggregates,
       },
       filters: {
         get: getFilters,
@@ -301,9 +301,9 @@ describe('NvtsPage tests', () => {
         get: getNvts,
         delete: deleteByIds,
         export: exportByIds,
-        getActiveDaysAggregates: getAggregates,
+        getSeverityAggregates: getAggregates,
+        getFamilyAggregates: getAggregates,
         getCreatedAggregates: getAggregates,
-        getWordCountsAggregates: getAggregates,
       },
       filters: {
         get: getFilters,
@@ -388,9 +388,9 @@ describe('NvtsPage tests', () => {
         get: getNvts,
         deleteByFilter,
         exportByFilter,
-        getActiveDaysAggregates: getAggregates,
+        getSeverityAggregates: getAggregates,
+        getFamilyAggregates: getAggregates,
         getCreatedAggregates: getAggregates,
-        getWordCountsAggregates: getAggregates,
       },
       filters: {
         get: getFilters,
diff --git a/src/web/pages/performance/__tests__/__snapshots__/startendtimeselection.js.snap b/src/web/pages/performance/__tests__/__snapshots__/startendtimeselection.js.snap
index e1cd61d8e0..f096183fd3 100644
--- a/src/web/pages/performance/__tests__/__snapshots__/startendtimeselection.js.snap
+++ b/src/web/pages/performance/__tests__/__snapshots__/startendtimeselection.js.snap
@@ -292,15 +292,12 @@ exports[`StartTimeSelection tests should render 1`] = `
     <label
       class="c2"
       data-testid="formgroup-title"
-      titleoffset="0"
-      titlesize="2"
     >
       Timezone
     </label>
     <div
       class="c3 c4"
       data-testid="timezone"
-      size="10"
     >
       CET
     </div>
@@ -311,22 +308,18 @@ exports[`StartTimeSelection tests should render 1`] = `
     <label
       class="c2"
       data-testid="formgroup-title"
-      titleoffset="0"
-      titlesize="2"
     >
       Start Time
     </label>
     <div
       class="c3 c4"
       data-testid="formgroup-content"
-      size="10"
     >
       <div
         class="c3 c5"
       >
         <div
           class="c0 c6"
-          margin="5px"
         >
           <div
             class="react-datepicker-wrapper"
@@ -355,7 +348,6 @@ exports[`StartTimeSelection tests should render 1`] = `
           >
             <div
               class="c3 c10"
-              margin="20px"
             >
               <span
                 class="c11"
@@ -425,22 +417,18 @@ exports[`StartTimeSelection tests should render 1`] = `
     <label
       class="c2"
       data-testid="formgroup-title"
-      titleoffset="0"
-      titlesize="2"
     >
       End Time
     </label>
     <div
       class="c3 c4"
       data-testid="formgroup-content"
-      size="10"
     >
       <div
         class="c3 c5"
       >
         <div
           class="c0 c6"
-          margin="5px"
         >
           <div
             class="react-datepicker-wrapper"
@@ -469,7 +457,6 @@ exports[`StartTimeSelection tests should render 1`] = `
           >
             <div
               class="c3 c10"
-              margin="20px"
             >
               <span
                 class="c11"
@@ -539,7 +526,6 @@ exports[`StartTimeSelection tests should render 1`] = `
     <div
       class="c3 c16"
       data-testid="formgroup-content"
-      offset="4"
     >
       <button
         class="c17 c18"
diff --git a/src/web/pages/performance/performancepage.js b/src/web/pages/performance/performancepage.js
index 644837398d..5557e6bbe5 100644
--- a/src/web/pages/performance/performancepage.js
+++ b/src/web/pages/performance/performancepage.js
@@ -61,6 +61,7 @@ import compose from 'web/utils/compose';
 import PropTypes from 'web/utils/proptypes';
 import withGmp from 'web/utils/withGmp';
 import {renderSelectItems} from 'web/utils/render';
+import {excludePropsConfig} from 'web/utils/styledConfig';
 
 import StartEndTimeSelection from './startendtimeselection';
 
@@ -148,7 +149,9 @@ ReportImage.propTypes = {
   startDate: PropTypes.date,
 };
 
-const Selector = withClickHandler()(styled.span`
+const Selector = withClickHandler()(styled.span.withConfig(
+  excludePropsConfig('duration'),
+)`
   ${props => {
     if (props.value !== props.duration) {
       return {
diff --git a/src/web/pages/policies/__tests__/__snapshots__/details.js.snap b/src/web/pages/policies/__tests__/__snapshots__/details.js.snap
index 10f64ee9e0..996fafddb6 100644
--- a/src/web/pages/policies/__tests__/__snapshots__/details.js.snap
+++ b/src/web/pages/policies/__tests__/__snapshots__/details.js.snap
@@ -192,7 +192,6 @@ exports[`Policy Details tests should render full Details 1`] = `
             >
               <div
                 class="c8 c9"
-                margin="5px"
               >
                 <a
                   class="c10"
diff --git a/src/web/pages/policies/__tests__/__snapshots__/detailspage.js.snap b/src/web/pages/policies/__tests__/__snapshots__/detailspage.js.snap
index 1dca38fc96..a0de015be6 100644
--- a/src/web/pages/policies/__tests__/__snapshots__/detailspage.js.snap
+++ b/src/web/pages/policies/__tests__/__snapshots__/detailspage.js.snap
@@ -375,6 +375,10 @@ exports[`Policy Detailspage tests should render full Detailspage 1`] = `
   border-top: 2px solid #11ab51;
 }
 
+.c25 :hover {
+  border-top: 2px solid #fff;
+}
+
 .c25 :first-child {
   border-left: 1px solid #e5e5e5;
 }
@@ -482,14 +486,12 @@ exports[`Policy Detailspage tests should render full Detailspage 1`] = `
     >
       <div
         class="c2 c4"
-        margin="10px"
       >
         <div
           class="c2 c3"
         >
           <div
             class="c2 c5"
-            margin="5px"
           >
             <a
               href="test/en/compliance-and-special-scans.html#configuring-and-managing-policies"
@@ -499,7 +501,6 @@ exports[`Policy Detailspage tests should render full Detailspage 1`] = `
               <span
                 class="c6 c7"
                 data-testid="svg-icon"
-                iconsize="small"
                 title="Help: Policies"
               >
                 <svg
@@ -516,7 +517,6 @@ exports[`Policy Detailspage tests should render full Detailspage 1`] = `
               <span
                 class="c6 c7"
                 data-testid="svg-icon"
-                iconsize="small"
                 title="Policies List"
               >
                 <svg
@@ -533,12 +533,10 @@ exports[`Policy Detailspage tests should render full Detailspage 1`] = `
         >
           <div
             class="c2 c5"
-            margin="5px"
           >
             <span
               class="c6 c9 c7"
               data-testid="svg-icon"
-              iconsize="small"
               title="Clone Policy"
             >
               <svg
@@ -550,7 +548,6 @@ exports[`Policy Detailspage tests should render full Detailspage 1`] = `
             <span
               class="c6 c9 c7"
               data-testid="svg-icon"
-              iconsize="small"
               title="Edit Policy"
             >
               <svg
@@ -562,7 +559,6 @@ exports[`Policy Detailspage tests should render full Detailspage 1`] = `
             <span
               class="c6 c9 c7"
               data-testid="svg-icon"
-              iconsize="small"
               title="Move Policy to trashcan"
             >
               <svg
@@ -574,7 +570,6 @@ exports[`Policy Detailspage tests should render full Detailspage 1`] = `
             <span
               class="c6 c9 c7"
               data-testid="svg-icon"
-              iconsize="small"
               title="Export Policy as XML"
             >
               <svg
@@ -803,7 +798,6 @@ exports[`Policy Detailspage tests should render full Detailspage 1`] = `
                     >
                       <div
                         class="c34 c5"
-                        margin="5px"
                       >
                         <a
                           class="c8"
@@ -923,14 +917,12 @@ exports[`Policy ToolBarIcons tests should render 1`] = `
 >
   <div
     class="c0 c2"
-    margin="10px"
   >
     <div
       class="c0 c1"
     >
       <div
         class="c0 c3"
-        margin="5px"
       >
         <a
           href="test/en/compliance-and-special-scans.html#configuring-and-managing-policies"
@@ -972,7 +964,6 @@ exports[`Policy ToolBarIcons tests should render 1`] = `
     >
       <div
         class="c0 c3"
-        margin="5px"
       >
         <span
           class="c4 c7 c5"
diff --git a/src/web/pages/policies/__tests__/__snapshots__/dialog.js.snap b/src/web/pages/policies/__tests__/__snapshots__/dialog.js.snap
index 3b7e342b7e..c2d2d86fb0 100644
--- a/src/web/pages/policies/__tests__/__snapshots__/dialog.js.snap
+++ b/src/web/pages/policies/__tests__/__snapshots__/dialog.js.snap
@@ -455,7 +455,6 @@ exports[`CreatePolicyDialog component tests should render dialog 1`] = `
               <div
                 class="c9"
                 data-testid="save-dialog-content"
-                maxheight="400px"
               >
                 <div
                   class="c10"
@@ -466,15 +465,12 @@ exports[`CreatePolicyDialog component tests should render dialog 1`] = `
                     <label
                       class="c12"
                       data-testid="formgroup-title"
-                      titleoffset="0"
-                      titlesize="2"
                     >
                       Name
                     </label>
                     <div
                       class="c13 c14"
                       data-testid="formgroup-content"
-                      size="10"
                     >
                       <input
                         class="c15 c16"
@@ -497,15 +493,12 @@ exports[`CreatePolicyDialog component tests should render dialog 1`] = `
                     <label
                       class="c12"
                       data-testid="formgroup-title"
-                      titleoffset="0"
-                      titlesize="2"
                     >
                       Comment
                     </label>
                     <div
                       class="c13 c14"
                       data-testid="formgroup-content"
-                      size="10"
                     >
                       <input
                         class="c15 c16"
diff --git a/src/web/pages/policies/__tests__/__snapshots__/listpage.js.snap b/src/web/pages/policies/__tests__/__snapshots__/listpage.js.snap
index 4064320345..c176acfecb 100644
--- a/src/web/pages/policies/__tests__/__snapshots__/listpage.js.snap
+++ b/src/web/pages/policies/__tests__/__snapshots__/listpage.js.snap
@@ -67,7 +67,6 @@ exports[`PoliciesPage ToolBarIcons test should render 1`] = `
 >
   <div
     class="c0 c2"
-    margin="5px"
   >
     <a
       href="test/en/compliance-and-special-scans.html#configuring-and-managing-policies"
@@ -811,7 +810,7 @@ exports[`PoliciesPage tests should render full PoliciesPage 1`] = `
   .c44 {
     color: #000;
     font-size: 1.2em;
-    background-color: none;
+    background-color: transparent;
     font-weight: bold;
   }
 }
@@ -820,7 +819,7 @@ exports[`PoliciesPage tests should render full PoliciesPage 1`] = `
   .c46 {
     color: #000;
     font-size: 1.2em;
-    background-color: none;
+    background-color: transparent;
     font-weight: bold;
   }
 }
@@ -853,7 +852,6 @@ exports[`PoliciesPage tests should render full PoliciesPage 1`] = `
         >
           <div
             class="c2 c4"
-            margin="5px"
           >
             <a
               href="test/en/compliance-and-special-scans.html#configuring-and-managing-policies"
@@ -863,7 +861,6 @@ exports[`PoliciesPage tests should render full PoliciesPage 1`] = `
               <span
                 class="c5 c6"
                 data-testid="svg-icon"
-                iconsize="small"
                 title="Help: Policies"
               >
                 <svg
@@ -876,7 +873,6 @@ exports[`PoliciesPage tests should render full PoliciesPage 1`] = `
             <span
               class="c5 c7 c6"
               data-testid="svg-icon"
-              iconsize="small"
               title="New Policy"
             >
               <svg
@@ -888,7 +884,6 @@ exports[`PoliciesPage tests should render full PoliciesPage 1`] = `
             <span
               class="c5 c7 c6"
               data-testid="svg-icon"
-              iconsize="small"
               title="Import Policy"
             >
               <svg
@@ -913,7 +908,6 @@ exports[`PoliciesPage tests should render full PoliciesPage 1`] = `
               >
                 <div
                   class="c11 c4 c12"
-                  margin="5px"
                 >
                   <div
                     class="c11"
@@ -945,12 +939,10 @@ exports[`PoliciesPage tests should render full PoliciesPage 1`] = `
                   >
                     <div
                       class="c11 c4"
-                      margin="5px"
                     >
                       <span
                         class="c5 c7 c6"
                         data-testid="svg-icon"
-                        iconsize="small"
                         title="Update Filter"
                       >
                         <svg
@@ -962,7 +954,6 @@ exports[`PoliciesPage tests should render full PoliciesPage 1`] = `
                       <span
                         class="c5 c7 c6"
                         data-testid="svg-icon"
-                        iconsize="small"
                         title="Remove Filter"
                       >
                         <svg
@@ -974,7 +965,6 @@ exports[`PoliciesPage tests should render full PoliciesPage 1`] = `
                       <span
                         class="c5 c7 c6"
                         data-testid="svg-icon"
-                        iconsize="small"
                         title="Reset to Default Filter"
                       >
                         <svg
@@ -991,7 +981,6 @@ exports[`PoliciesPage tests should render full PoliciesPage 1`] = `
                         <span
                           class="c5 c6"
                           data-testid="svg-icon"
-                          iconsize="small"
                           title="Help: Powerfilter"
                         >
                           <svg
@@ -1038,7 +1027,6 @@ exports[`PoliciesPage tests should render full PoliciesPage 1`] = `
                       <span
                         class="c23 c24"
                         data-testid="select-open-button"
-                        iconsize="small"
                       >
                         ▼
                       </span>
@@ -1115,7 +1103,6 @@ exports[`PoliciesPage tests should render full PoliciesPage 1`] = `
                 >
                   <div
                     class="c2 c4"
-                    margin="5px"
                   >
                     <span
                       class="c5 c38 c6"
@@ -1151,7 +1138,6 @@ exports[`PoliciesPage tests should render full PoliciesPage 1`] = `
                 >
                   <div
                     class="c2 c4"
-                    margin="5px"
                   >
                     <span
                       class="c5 c38 c6"
@@ -1252,7 +1238,6 @@ exports[`PoliciesPage tests should render full PoliciesPage 1`] = `
                       >
                         <div
                           class="c52 c4"
-                          margin="5px"
                         >
                           <span
                             class="c5 c7 c6"
@@ -1328,7 +1313,6 @@ exports[`PoliciesPage tests should render full PoliciesPage 1`] = `
                       >
                         <div
                           class="c2 c4"
-                          margin="5px"
                         >
                           <div
                             aria-expanded="false"
@@ -1380,7 +1364,6 @@ exports[`PoliciesPage tests should render full PoliciesPage 1`] = `
                           >
                             <div
                               class="c2 c4"
-                              margin="5px"
                             >
                               <span
                                 class="c5 c7 c6"
@@ -1429,7 +1412,6 @@ exports[`PoliciesPage tests should render full PoliciesPage 1`] = `
                 >
                   <div
                     class="c2 c4"
-                    margin="5px"
                   >
                     <span
                       class="c5 c38 c6"
@@ -1465,7 +1447,6 @@ exports[`PoliciesPage tests should render full PoliciesPage 1`] = `
                 >
                   <div
                     class="c2 c4"
-                    margin="5px"
                   >
                     <span
                       class="c5 c38 c6"
diff --git a/src/web/pages/policies/__tests__/__snapshots__/row.js.snap b/src/web/pages/policies/__tests__/__snapshots__/row.js.snap
index 3de1a8ee8b..c5cdd01c98 100644
--- a/src/web/pages/policies/__tests__/__snapshots__/row.js.snap
+++ b/src/web/pages/policies/__tests__/__snapshots__/row.js.snap
@@ -204,7 +204,6 @@ exports[`Row tests should render 1`] = `
           >
             <div
               class="c6 c7"
-              margin="5px"
             >
               <span
                 class="c8 c9 c10"
diff --git a/src/web/pages/policies/__tests__/__snapshots__/table.js.snap b/src/web/pages/policies/__tests__/__snapshots__/table.js.snap
index 1020a2cb4a..ef9145275c 100644
--- a/src/web/pages/policies/__tests__/__snapshots__/table.js.snap
+++ b/src/web/pages/policies/__tests__/__snapshots__/table.js.snap
@@ -467,7 +467,7 @@ exports[`Policies table tests should render 1`] = `
   .c18 {
     color: #000;
     font-size: 1.2em;
-    background-color: none;
+    background-color: transparent;
     font-weight: bold;
   }
 }
@@ -476,7 +476,7 @@ exports[`Policies table tests should render 1`] = `
   .c19 {
     color: #000;
     font-size: 1.2em;
-    background-color: none;
+    background-color: transparent;
     font-weight: bold;
   }
 }
@@ -523,7 +523,6 @@ exports[`Policies table tests should render 1`] = `
           >
             <div
               class="c9 c11"
-              margin="5px"
             >
               <span
                 class="c3 c12 c5"
@@ -559,7 +558,6 @@ exports[`Policies table tests should render 1`] = `
           >
             <div
               class="c9 c11"
-              margin="5px"
             >
               <span
                 class="c3 c12 c5"
@@ -656,7 +654,6 @@ exports[`Policies table tests should render 1`] = `
                 >
                   <div
                     class="c25 c11"
-                    margin="5px"
                   >
                     <span
                       class="c3 c4 c5"
@@ -757,7 +754,6 @@ exports[`Policies table tests should render 1`] = `
                 >
                   <div
                     class="c25 c11"
-                    margin="5px"
                   >
                     <span
                       class="c3 c4 c5"
@@ -858,7 +854,6 @@ exports[`Policies table tests should render 1`] = `
                 >
                   <div
                     class="c25 c11"
-                    margin="5px"
                   >
                     <span
                       class="c3 c4 c5"
@@ -934,7 +929,6 @@ exports[`Policies table tests should render 1`] = `
                 >
                   <div
                     class="c9 c11"
-                    margin="5px"
                   >
                     <div
                       aria-expanded="false"
@@ -983,7 +977,6 @@ exports[`Policies table tests should render 1`] = `
                     >
                       <div
                         class="c9 c11"
-                        margin="5px"
                       >
                         <span
                           class="c3 c5"
@@ -1026,7 +1019,6 @@ exports[`Policies table tests should render 1`] = `
           >
             <div
               class="c9 c11"
-              margin="5px"
             >
               <span
                 class="c3 c12 c5"
@@ -1062,7 +1054,6 @@ exports[`Policies table tests should render 1`] = `
           >
             <div
               class="c9 c11"
-              margin="5px"
             >
               <span
                 class="c3 c12 c5"
diff --git a/src/web/pages/radius/__tests__/__snapshots__/dialog.js.snap b/src/web/pages/radius/__tests__/__snapshots__/dialog.js.snap
index bffe64bca2..a7099b12b4 100644
--- a/src/web/pages/radius/__tests__/__snapshots__/dialog.js.snap
+++ b/src/web/pages/radius/__tests__/__snapshots__/dialog.js.snap
@@ -518,7 +518,6 @@ exports[`RADIUS dialog component tests should render dialog 1`] = `
               <div
                 class="c9"
                 data-testid="save-dialog-content"
-                maxheight="400px"
               >
                 <div
                   class="c10"
@@ -529,15 +528,12 @@ exports[`RADIUS dialog component tests should render dialog 1`] = `
                     <label
                       class="c12"
                       data-testid="formgroup-title"
-                      titleoffset="0"
-                      titlesize="2"
                     >
                       Enable
                     </label>
                     <div
                       class="c13 c14"
                       data-testid="formgroup-content"
-                      size="10"
                     >
                       <label
                         class="c15"
@@ -547,7 +543,6 @@ exports[`RADIUS dialog component tests should render dialog 1`] = `
                         >
                           <div
                             class="c13 c17"
-                            margin="5px"
                           >
                             <input
                               checked=""
@@ -567,15 +562,12 @@ exports[`RADIUS dialog component tests should render dialog 1`] = `
                     <label
                       class="c12"
                       data-testid="formgroup-title"
-                      titleoffset="0"
-                      titlesize="2"
                     >
                       RADIUS Host
                     </label>
                     <div
                       class="c13 c14"
                       data-testid="formgroup-content"
-                      size="10"
                     >
                       <input
                         class="c20 c21"
@@ -599,15 +591,12 @@ exports[`RADIUS dialog component tests should render dialog 1`] = `
                     <label
                       class="c12"
                       data-testid="formgroup-title"
-                      titleoffset="0"
-                      titlesize="2"
                     >
                       Secret Key
                     </label>
                     <div
                       class="c13 c14"
                       data-testid="formgroup-content"
-                      size="10"
                     >
                       <input
                         class="c20 c21"
diff --git a/src/web/pages/reports/deltadetailspage.js b/src/web/pages/reports/deltadetailspage.js
index 02586e4480..f7f96e73ad 100644
--- a/src/web/pages/reports/deltadetailspage.js
+++ b/src/web/pages/reports/deltadetailspage.js
@@ -155,31 +155,26 @@ class DeltaReportDetails extends React.Component {
     this.handleError = this.handleError.bind(this);
     this.handleFilterAddLogLevel = this.handleFilterAddLogLevel.bind(this);
     this.handleFilterChange = this.handleFilterChange.bind(this);
-    this.handleFilterDecreaseMinQoD = this.handleFilterDecreaseMinQoD.bind(
-      this,
-    );
+    this.handleFilterDecreaseMinQoD =
+      this.handleFilterDecreaseMinQoD.bind(this);
     this.handleFilterCreated = this.handleFilterCreated.bind(this);
     this.handleFilterEditClick = this.handleFilterEditClick.bind(this);
-    this.handleFilterRemoveSeverity = this.handleFilterRemoveSeverity.bind(
-      this,
-    );
+    this.handleFilterRemoveSeverity =
+      this.handleFilterRemoveSeverity.bind(this);
     this.handleFilterRemoveClick = this.handleFilterRemoveClick.bind(this);
     this.handleFilterResetClick = this.handleFilterResetClick.bind(this);
     this.handleRemoveFromAssets = this.handleRemoveFromAssets.bind(this);
     this.handleReportDownload = this.handleReportDownload.bind(this);
-    this.handleTlsCertificateDownload = this.handleTlsCertificateDownload.bind(
-      this,
-    );
+    this.handleTlsCertificateDownload =
+      this.handleTlsCertificateDownload.bind(this);
     this.handleFilterDialogClose = this.handleFilterDialogClose.bind(this);
     this.handleSortChange = this.handleSortChange.bind(this);
 
     this.loadTarget = this.loadTarget.bind(this);
-    this.handleOpenDownloadReportDialog = this.handleOpenDownloadReportDialog.bind(
-      this,
-    );
-    this.handleCloseDownloadReportDialog = this.handleCloseDownloadReportDialog.bind(
-      this,
-    );
+    this.handleOpenDownloadReportDialog =
+      this.handleOpenDownloadReportDialog.bind(this);
+    this.handleCloseDownloadReportDialog =
+      this.handleCloseDownloadReportDialog.bind(this);
   }
 
   componentDidMount() {
@@ -324,12 +319,8 @@ class DeltaReportDetails extends React.Component {
       username,
       onDownload,
     } = this.props;
-    const {
-      includeNotes,
-      includeOverrides,
-      reportFormatId,
-      storeAsDefault,
-    } = state;
+    const {includeNotes, includeOverrides, reportFormatId, storeAsDefault} =
+      state;
 
     const newFilter = reportFilter.copy();
     newFilter.set('notes', includeNotes);
@@ -567,7 +558,7 @@ class DeltaReportDetails extends React.Component {
 }
 
 DeltaReportDetails.propTypes = {
-  defaultFilter: PropTypes.filter.isRequired,
+  defaultFilter: PropTypes.filter,
   deltaReportId: PropTypes.id,
   entity: PropTypes.model,
   entityError: PropTypes.object,
@@ -658,38 +649,40 @@ const reloadInterval = report =>
     ? USE_DEFAULT_RELOAD_INTERVAL_ACTIVE
     : NO_RELOAD; // report doesn't change anymore. no need to reload
 
-const load = ({
-  defaultFilter,
-  reportId,
-  deltaReportId,
-  loadReport,
-  loadReportIfNeeded,
-  reportFilter,
-}) => filter => {
-  if (!hasValue(filter)) {
-    // use loaded filter after initial loading
-    filter = reportFilter;
-  }
+const load =
+  ({
+    defaultFilter,
+    reportId,
+    deltaReportId,
+    loadReport,
+    loadReportIfNeeded,
+    reportFilter,
+  }) =>
+  filter => {
+    if (!hasValue(filter)) {
+      // use loaded filter after initial loading
+      filter = reportFilter;
+    }
 
-  if (!hasValue(filter)) {
-    // use filter from user setting
-    filter = defaultFilter;
-  }
+    if (!hasValue(filter)) {
+      // use filter from user setting
+      filter = defaultFilter;
+    }
 
-  if (!hasValue(filter)) {
-    // use fallback filter
-    filter = DEFAULT_FILTER;
-  }
+    if (!hasValue(filter)) {
+      // use fallback filter
+      filter = DEFAULT_FILTER;
+    }
 
-  // to avoid confusion of loaded results with different sort terms and
-  // directions, always load the report with sort=name from gvmd (the user's
-  // sort term will be handled by GSA in the browser)
-  filter.delete('sort-reverse');
-  filter.set('sort', 'name');
-  return loadReportIfNeeded(reportId, deltaReportId, filter).then(() =>
-    loadReport(reportId, deltaReportId, filter),
-  );
-};
+    // to avoid confusion of loaded results with different sort terms and
+    // directions, always load the report with sort=name from gvmd (the user's
+    // sort term will be handled by GSA in the browser)
+    filter.delete('sort-reverse');
+    filter.set('sort', 'name');
+    return loadReportIfNeeded(reportId, deltaReportId, filter).then(() =>
+      loadReport(reportId, deltaReportId, filter),
+    );
+  };
 
 const DeltaReportDetailsWrapper = ({defaultFilter, reportFilter, ...props}) => (
   <Reload
diff --git a/src/web/pages/reports/details/summary.js b/src/web/pages/reports/details/summary.js
index f73b986627..5be18726af 100644
--- a/src/web/pages/reports/details/summary.js
+++ b/src/web/pages/reports/details/summary.js
@@ -44,8 +44,11 @@ import TableData from 'web/components/table/data';
 import {Col} from 'web/entity/page';
 
 import PropTypes from 'web/utils/proptypes';
+import {excludePropsConfig} from 'web/utils/styledConfig';
 
-const UpdatingTable = styled(Table)`
+const UpdatingTable = styled(Table).withConfig(
+  excludePropsConfig(['isUpdating']),
+)`
   opacity: ${props => (props.isUpdating ? '0.2' : '1.0')};
 `;
 
diff --git a/src/web/pages/reports/row.js b/src/web/pages/reports/row.js
index 6870a66ac0..c4362b8a03 100644
--- a/src/web/pages/reports/row.js
+++ b/src/web/pages/reports/row.js
@@ -104,7 +104,7 @@ const Row = ({
   let progress;
 
   if (isDefined(task)) {
-    if (task.isContainer()) {
+    if (task.isContainer() && status !== TASK_STATUS.processing) {
       status =
         status === TASK_STATUS.running
           ? TASK_STATUS.uploading
diff --git a/src/web/pages/results/__tests__/row.js b/src/web/pages/results/__tests__/row.js
index 0449771c3b..fbdd969dfa 100644
--- a/src/web/pages/results/__tests__/row.js
+++ b/src/web/pages/results/__tests__/row.js
@@ -47,7 +47,13 @@ describe('Delta reports V2 with changed severity, qod and hostname', () => {
       },
     });
 
-    const {getAllByTestId} = render(<Row entity={entity} />);
+    const {getAllByTestId} = render(
+      <table>
+        <tbody>
+          <Row entity={entity} />
+        </tbody>
+      </table>,
+    );
     const icons = getAllByTestId('svg-icon');
 
     expect(icons.length).toEqual(3);
@@ -83,7 +89,13 @@ describe('Delta reports V2 with same severity, qod and hostname', () => {
       },
     });
 
-    const {queryAllByTestId} = render(<Row entity={entity} />);
+    const {queryAllByTestId} = render(
+      <table>
+        <tbody>
+          <Row entity={entity} />
+        </tbody>
+      </table>,
+    );
     const icons = queryAllByTestId('svg-icon');
 
     expect(icons.length).toBe(0);
diff --git a/src/web/pages/results/details.js b/src/web/pages/results/details.js
index 7ad40dbbc7..fded4a22da 100644
--- a/src/web/pages/results/details.js
+++ b/src/web/pages/results/details.js
@@ -56,7 +56,7 @@ import Diff, {Added, Removed} from './diff';
 */
 const Pre = styled.pre`
   white-space: pre-wrap;
-  word-wrap: word-break;
+  word-wrap: break-word;
 `;
 
 const GrowDiv = styled.div`
@@ -191,8 +191,12 @@ const ResultDetails = ({className, links = true, entity}) => {
             ) : (
               <DerivedDiff
                 deltaType={deltaType}
-                firstDescription={result1Description}
-                secondDesription={result2Description}
+                firstDescription={
+                  isDefined(result1Description) ? result1Description : ''
+                }
+                secondDesription={
+                  isDefined(result2Description) ? result2Description : ''
+                }
               />
             )}
           </div>
@@ -329,7 +333,9 @@ const ResultDetails = ({className, links = true, entity}) => {
         solutionType={solution?.type}
       />
 
-      <References links={links} nvt={information} />
+      {information.entityType === 'nvt' && (
+        <References links={links} nvt={information} />
+      )}
     </Layout>
   );
 };
diff --git a/src/web/pages/results/detailspage.js b/src/web/pages/results/detailspage.js
index 8b062860e5..14ebe5fcfa 100644
--- a/src/web/pages/results/detailspage.js
+++ b/src/web/pages/results/detailspage.js
@@ -418,7 +418,7 @@ class Page extends React.Component {
 }
 
 Page.propTypes = {
-  detailsExportFileName: PropTypes.object,
+  detailsExportFileName: PropTypes.string,
   entity: PropTypes.model,
   gmp: PropTypes.gmp.isRequired,
   username: PropTypes.string,
diff --git a/src/web/pages/scanconfigs/__tests__/__snapshots__/details.js.snap b/src/web/pages/scanconfigs/__tests__/__snapshots__/details.js.snap
index 288db4048d..5ff2400ea4 100644
--- a/src/web/pages/scanconfigs/__tests__/__snapshots__/details.js.snap
+++ b/src/web/pages/scanconfigs/__tests__/__snapshots__/details.js.snap
@@ -192,7 +192,6 @@ exports[`Scan Config Details tests should render full Details 1`] = `
             >
               <div
                 class="c8 c9"
-                margin="5px"
               >
                 <a
                   class="c10"
diff --git a/src/web/pages/scanconfigs/__tests__/__snapshots__/detailspage.js.snap b/src/web/pages/scanconfigs/__tests__/__snapshots__/detailspage.js.snap
index 7823f9dff8..6613de0317 100644
--- a/src/web/pages/scanconfigs/__tests__/__snapshots__/detailspage.js.snap
+++ b/src/web/pages/scanconfigs/__tests__/__snapshots__/detailspage.js.snap
@@ -375,6 +375,10 @@ exports[`Scan Config Detailspage tests should render full Detailspage 1`] = `
   border-top: 2px solid #11ab51;
 }
 
+.c25 :hover {
+  border-top: 2px solid #fff;
+}
+
 .c25 :first-child {
   border-left: 1px solid #e5e5e5;
 }
@@ -482,14 +486,12 @@ exports[`Scan Config Detailspage tests should render full Detailspage 1`] = `
     >
       <div
         class="c2 c4"
-        margin="10px"
       >
         <div
           class="c2 c3"
         >
           <div
             class="c2 c5"
-            margin="5px"
           >
             <a
               href="test/en/scanning.html#managing-scan-configurations"
@@ -499,7 +501,6 @@ exports[`Scan Config Detailspage tests should render full Detailspage 1`] = `
               <span
                 class="c6 c7"
                 data-testid="svg-icon"
-                iconsize="small"
                 title="Help: ScanConfigs"
               >
                 <svg
@@ -516,7 +517,6 @@ exports[`Scan Config Detailspage tests should render full Detailspage 1`] = `
               <span
                 class="c6 c7"
                 data-testid="svg-icon"
-                iconsize="small"
                 title="ScanConfig List"
               >
                 <svg
@@ -533,12 +533,10 @@ exports[`Scan Config Detailspage tests should render full Detailspage 1`] = `
         >
           <div
             class="c2 c5"
-            margin="5px"
           >
             <span
               class="c6 c9 c7"
               data-testid="svg-icon"
-              iconsize="small"
               title="Create new Scan Config"
             >
               <svg
@@ -550,7 +548,6 @@ exports[`Scan Config Detailspage tests should render full Detailspage 1`] = `
             <span
               class="c6 c9 c7"
               data-testid="svg-icon"
-              iconsize="small"
               title="Clone Scan Config"
             >
               <svg
@@ -562,7 +559,6 @@ exports[`Scan Config Detailspage tests should render full Detailspage 1`] = `
             <span
               class="c6 c9 c7"
               data-testid="svg-icon"
-              iconsize="small"
               title="Edit Scan Config"
             >
               <svg
@@ -574,7 +570,6 @@ exports[`Scan Config Detailspage tests should render full Detailspage 1`] = `
             <span
               class="c6 c9 c7"
               data-testid="svg-icon"
-              iconsize="small"
               title="Move Scan Config to trashcan"
             >
               <svg
@@ -586,7 +581,6 @@ exports[`Scan Config Detailspage tests should render full Detailspage 1`] = `
             <span
               class="c6 c9 c7"
               data-testid="svg-icon"
-              iconsize="small"
               title="Export Scan Config as XML"
             >
               <svg
@@ -598,7 +592,6 @@ exports[`Scan Config Detailspage tests should render full Detailspage 1`] = `
             <span
               class="c6 c9 c7"
               data-testid="svg-icon"
-              iconsize="small"
               title="Import Scan Config"
             >
               <svg
@@ -847,7 +840,6 @@ exports[`Scan Config Detailspage tests should render full Detailspage 1`] = `
                     >
                       <div
                         class="c34 c5"
-                        margin="5px"
                       >
                         <a
                           class="c8"
@@ -967,14 +959,12 @@ exports[`Scan Config ToolBarIcons tests should render 1`] = `
 >
   <div
     class="c0 c2"
-    margin="10px"
   >
     <div
       class="c0 c1"
     >
       <div
         class="c0 c3"
-        margin="5px"
       >
         <a
           href="test/en/scanning.html#managing-scan-configurations"
@@ -1016,7 +1006,6 @@ exports[`Scan Config ToolBarIcons tests should render 1`] = `
     >
       <div
         class="c0 c3"
-        margin="5px"
       >
         <span
           class="c4 c7 c5"
diff --git a/src/web/pages/scanconfigs/__tests__/__snapshots__/editconfigfamilydialog.js.snap b/src/web/pages/scanconfigs/__tests__/__snapshots__/editconfigfamilydialog.js.snap
index 585714ab97..387489f182 100644
--- a/src/web/pages/scanconfigs/__tests__/__snapshots__/editconfigfamilydialog.js.snap
+++ b/src/web/pages/scanconfigs/__tests__/__snapshots__/editconfigfamilydialog.js.snap
@@ -665,7 +665,7 @@ exports[`EditConfigFamilyDialog component tests should render dialog 1`] = `
   .c21 {
     color: #000;
     font-size: 1.2em;
-    background-color: none;
+    background-color: transparent;
     font-weight: bold;
   }
 }
@@ -734,7 +734,6 @@ exports[`EditConfigFamilyDialog component tests should render dialog 1`] = `
               <div
                 class="c9"
                 data-testid="save-dialog-content"
-                maxheight="400px"
               >
                 <div
                   class="c10"
@@ -916,7 +915,6 @@ exports[`EditConfigFamilyDialog component tests should render dialog 1`] = `
                               class="c10"
                             >
                               <div
-                                boxbackground="#4C4C4C"
                                 class="c25"
                                 data-testid="progressbar-box"
                                 title="Low"
@@ -925,7 +923,6 @@ exports[`EditConfigFamilyDialog component tests should render dialog 1`] = `
                                   background="low"
                                   class="c26"
                                   data-testid="progress"
-                                  progress="10"
                                 />
                                 <div
                                   class="c27"
@@ -963,7 +960,6 @@ exports[`EditConfigFamilyDialog component tests should render dialog 1`] = `
                                   >
                                     <div
                                       class="c23 c31"
-                                      margin="5px"
                                     >
                                       <input
                                         class="c32 c33"
@@ -1014,7 +1010,6 @@ exports[`EditConfigFamilyDialog component tests should render dialog 1`] = `
                               class="c10"
                             >
                               <div
-                                boxbackground="#4C4C4C"
                                 class="c25"
                                 data-testid="progressbar-box"
                                 title="High"
@@ -1023,7 +1018,6 @@ exports[`EditConfigFamilyDialog component tests should render dialog 1`] = `
                                   background="error"
                                   class="c38"
                                   data-testid="progress"
-                                  progress="100"
                                 />
                                 <div
                                   class="c27"
@@ -1061,7 +1055,6 @@ exports[`EditConfigFamilyDialog component tests should render dialog 1`] = `
                                   >
                                     <div
                                       class="c23 c31"
-                                      margin="5px"
                                     >
                                       <input
                                         class="c32 c33"
@@ -1505,7 +1498,6 @@ exports[`EditConfigFamilyDialog component tests should render loading indicator
               <div
                 class="c9"
                 data-testid="save-dialog-content"
-                maxheight="400px"
               >
                 <div
                   class="c10 c11"
diff --git a/src/web/pages/scanconfigs/__tests__/__snapshots__/editdialog.js.snap b/src/web/pages/scanconfigs/__tests__/__snapshots__/editdialog.js.snap
index 9401971c42..8ff7708e53 100644
--- a/src/web/pages/scanconfigs/__tests__/__snapshots__/editdialog.js.snap
+++ b/src/web/pages/scanconfigs/__tests__/__snapshots__/editdialog.js.snap
@@ -852,7 +852,7 @@ exports[`EditScanConfigDialog component tests should render dialog 1`] = `
   .c33 {
     color: #000;
     font-size: 1.2em;
-    background-color: none;
+    background-color: transparent;
     font-weight: bold;
   }
 }
@@ -861,7 +861,7 @@ exports[`EditScanConfigDialog component tests should render dialog 1`] = `
   .c34 {
     color: #000;
     font-size: 1.2em;
-    background-color: none;
+    background-color: transparent;
     font-weight: bold;
   }
 }
@@ -870,7 +870,7 @@ exports[`EditScanConfigDialog component tests should render dialog 1`] = `
   .c49 {
     color: #000;
     font-size: 1.2em;
-    background-color: none;
+    background-color: transparent;
     font-weight: bold;
   }
 }
@@ -879,7 +879,7 @@ exports[`EditScanConfigDialog component tests should render dialog 1`] = `
   .c50 {
     color: #000;
     font-size: 1.2em;
-    background-color: none;
+    background-color: transparent;
     font-weight: bold;
   }
 }
@@ -923,7 +923,6 @@ exports[`EditScanConfigDialog component tests should render dialog 1`] = `
               <div
                 class="c9"
                 data-testid="save-dialog-content"
-                maxheight="400px"
               >
                 <div
                   class="c10"
@@ -934,15 +933,12 @@ exports[`EditScanConfigDialog component tests should render dialog 1`] = `
                     <label
                       class="c12"
                       data-testid="formgroup-title"
-                      titleoffset="0"
-                      titlesize="2"
                     >
                       Name
                     </label>
                     <div
                       class="c13 c14"
                       data-testid="formgroup-content"
-                      size="10"
                     >
                       <input
                         class="c15 c16"
@@ -965,15 +961,12 @@ exports[`EditScanConfigDialog component tests should render dialog 1`] = `
                     <label
                       class="c12"
                       data-testid="formgroup-title"
-                      titleoffset="0"
-                      titlesize="2"
                     >
                       Comment
                     </label>
                     <div
                       class="c13 c14"
                       data-testid="formgroup-content"
-                      size="10"
                     >
                       <input
                         class="c15 c16"
@@ -1025,7 +1018,6 @@ exports[`EditScanConfigDialog component tests should render dialog 1`] = `
                     </div>
                     <div
                       class="c28"
-                      foldstate="UNFOLDED"
                     >
                       <div
                         class="c29"
@@ -1111,7 +1103,6 @@ exports[`EditScanConfigDialog component tests should render dialog 1`] = `
                                   >
                                     <div
                                       class="c13 c39"
-                                      margin="5px"
                                     >
                                       <label
                                         class="c40"
@@ -1121,7 +1112,6 @@ exports[`EditScanConfigDialog component tests should render dialog 1`] = `
                                         >
                                           <div
                                             class="c13 c39"
-                                            margin="5px"
                                           >
                                             <input
                                               checked=""
@@ -1151,7 +1141,6 @@ exports[`EditScanConfigDialog component tests should render dialog 1`] = `
                                         >
                                           <div
                                             class="c13 c39"
-                                            margin="5px"
                                           >
                                             <input
                                               class="c41 c42"
@@ -1188,7 +1177,6 @@ exports[`EditScanConfigDialog component tests should render dialog 1`] = `
                                     >
                                       <div
                                         class="c13 c39"
-                                        margin="5px"
                                       >
                                         <input
                                           checked=""
@@ -1243,7 +1231,6 @@ exports[`EditScanConfigDialog component tests should render dialog 1`] = `
                                   >
                                     <div
                                       class="c13 c39"
-                                      margin="5px"
                                     >
                                       <label
                                         class="c40"
@@ -1253,7 +1240,6 @@ exports[`EditScanConfigDialog component tests should render dialog 1`] = `
                                         >
                                           <div
                                             class="c13 c39"
-                                            margin="5px"
                                           >
                                             <input
                                               class="c41 c42"
@@ -1282,7 +1268,6 @@ exports[`EditScanConfigDialog component tests should render dialog 1`] = `
                                         >
                                           <div
                                             class="c13 c39"
-                                            margin="5px"
                                           >
                                             <input
                                               checked=""
@@ -1320,7 +1305,6 @@ exports[`EditScanConfigDialog component tests should render dialog 1`] = `
                                     >
                                       <div
                                         class="c13 c39"
-                                        margin="5px"
                                       >
                                         <input
                                           class="c41 c44"
@@ -1374,7 +1358,6 @@ exports[`EditScanConfigDialog component tests should render dialog 1`] = `
                                   >
                                     <div
                                       class="c13 c39"
-                                      margin="5px"
                                     >
                                       <label
                                         class="c40"
@@ -1384,7 +1367,6 @@ exports[`EditScanConfigDialog component tests should render dialog 1`] = `
                                         >
                                           <div
                                             class="c13 c39"
-                                            margin="5px"
                                           >
                                             <input
                                               class="c41 c42"
@@ -1413,7 +1395,6 @@ exports[`EditScanConfigDialog component tests should render dialog 1`] = `
                                         >
                                           <div
                                             class="c13 c39"
-                                            margin="5px"
                                           >
                                             <input
                                               checked=""
@@ -1451,7 +1432,6 @@ exports[`EditScanConfigDialog component tests should render dialog 1`] = `
                                     >
                                       <div
                                         class="c13 c39"
-                                        margin="5px"
                                       >
                                         <input
                                           class="c41 c44"
@@ -1505,7 +1485,6 @@ exports[`EditScanConfigDialog component tests should render dialog 1`] = `
                                   >
                                     <div
                                       class="c13 c39"
-                                      margin="5px"
                                     >
                                       <label
                                         class="c40"
@@ -1515,7 +1494,6 @@ exports[`EditScanConfigDialog component tests should render dialog 1`] = `
                                         >
                                           <div
                                             class="c13 c39"
-                                            margin="5px"
                                           >
                                             <input
                                               class="c41 c42"
@@ -1544,7 +1522,6 @@ exports[`EditScanConfigDialog component tests should render dialog 1`] = `
                                         >
                                           <div
                                             class="c13 c39"
-                                            margin="5px"
                                           >
                                             <input
                                               checked=""
@@ -1582,7 +1559,6 @@ exports[`EditScanConfigDialog component tests should render dialog 1`] = `
                                     >
                                       <div
                                         class="c13 c39"
-                                        margin="5px"
                                       >
                                         <input
                                           class="c41 c44"
@@ -1652,7 +1628,6 @@ exports[`EditScanConfigDialog component tests should render dialog 1`] = `
                     </div>
                     <div
                       class="c46"
-                      foldstate="FOLDED"
                     >
                       <div
                         class="c29"
@@ -1768,7 +1743,6 @@ exports[`EditScanConfigDialog component tests should render dialog 1`] = `
                     </div>
                     <div
                       class="c46"
-                      foldstate="FOLDED"
                     >
                       <div
                         class="c29"
@@ -2469,7 +2443,6 @@ exports[`EditScanConfigDialog component tests should render dialog for config in
               <div
                 class="c9"
                 data-testid="save-dialog-content"
-                maxheight="400px"
               >
                 <div
                   class="c10"
@@ -2480,15 +2453,12 @@ exports[`EditScanConfigDialog component tests should render dialog for config in
                     <label
                       class="c12"
                       data-testid="formgroup-title"
-                      titleoffset="0"
-                      titlesize="2"
                     >
                       Name
                     </label>
                     <div
                       class="c13 c14"
                       data-testid="formgroup-content"
-                      size="10"
                     >
                       <input
                         class="c15 c16"
@@ -2511,15 +2481,12 @@ exports[`EditScanConfigDialog component tests should render dialog for config in
                     <label
                       class="c12"
                       data-testid="formgroup-title"
-                      titleoffset="0"
-                      titlesize="2"
                     >
                       Comment
                     </label>
                     <div
                       class="c13 c14"
                       data-testid="formgroup-content"
-                      size="10"
                     >
                       <input
                         class="c15 c16"
@@ -3047,7 +3014,6 @@ exports[`EditScanConfigDialog component tests should render dialog inline notifi
               <div
                 class="c9"
                 data-testid="save-dialog-content"
-                maxheight="400px"
               >
                 <div
                   class="c10"
@@ -3058,15 +3024,12 @@ exports[`EditScanConfigDialog component tests should render dialog inline notifi
                     <label
                       class="c12"
                       data-testid="formgroup-title"
-                      titleoffset="0"
-                      titlesize="2"
                     >
                       Name
                     </label>
                     <div
                       class="c13 c14"
                       data-testid="formgroup-content"
-                      size="10"
                     >
                       <input
                         class="c15 c16"
@@ -3089,15 +3052,12 @@ exports[`EditScanConfigDialog component tests should render dialog inline notifi
                     <label
                       class="c12"
                       data-testid="formgroup-title"
-                      titleoffset="0"
-                      titlesize="2"
                     >
                       Comment
                     </label>
                     <div
                       class="c13 c14"
                       data-testid="formgroup-content"
-                      size="10"
                     >
                       <input
                         class="c15 c16"
diff --git a/src/web/pages/scanconfigs/__tests__/__snapshots__/listpage.js.snap b/src/web/pages/scanconfigs/__tests__/__snapshots__/listpage.js.snap
index 09e66ff401..b42475a647 100644
--- a/src/web/pages/scanconfigs/__tests__/__snapshots__/listpage.js.snap
+++ b/src/web/pages/scanconfigs/__tests__/__snapshots__/listpage.js.snap
@@ -67,7 +67,6 @@ exports[`ScanConfigsPage ToolBarIcons test should render 1`] = `
 >
   <div
     class="c0 c2"
-    margin="5px"
   >
     <a
       href="test/en/scanning.html#managing-scan-configurations"
@@ -827,7 +826,7 @@ exports[`ScanConfigsPage tests should render full ScanConfigsPage 1`] = `
   .c44 {
     color: #000;
     font-size: 1.2em;
-    background-color: none;
+    background-color: transparent;
     font-weight: bold;
   }
 }
@@ -836,7 +835,7 @@ exports[`ScanConfigsPage tests should render full ScanConfigsPage 1`] = `
   .c46 {
     color: #000;
     font-size: 1.2em;
-    background-color: none;
+    background-color: transparent;
     font-weight: bold;
   }
 }
@@ -845,7 +844,7 @@ exports[`ScanConfigsPage tests should render full ScanConfigsPage 1`] = `
   .c47 {
     color: #000;
     font-size: 1.2em;
-    background-color: none;
+    background-color: transparent;
     font-weight: bold;
   }
 }
@@ -854,7 +853,7 @@ exports[`ScanConfigsPage tests should render full ScanConfigsPage 1`] = `
   .c49 {
     color: #000;
     font-size: 1.2em;
-    background-color: none;
+    background-color: transparent;
     font-weight: bold;
   }
 }
@@ -887,7 +886,6 @@ exports[`ScanConfigsPage tests should render full ScanConfigsPage 1`] = `
         >
           <div
             class="c2 c4"
-            margin="5px"
           >
             <a
               href="test/en/scanning.html#managing-scan-configurations"
@@ -897,7 +895,6 @@ exports[`ScanConfigsPage tests should render full ScanConfigsPage 1`] = `
               <span
                 class="c5 c6"
                 data-testid="svg-icon"
-                iconsize="small"
                 title="Help: Scan Configs"
               >
                 <svg
@@ -910,7 +907,6 @@ exports[`ScanConfigsPage tests should render full ScanConfigsPage 1`] = `
             <span
               class="c5 c7 c6"
               data-testid="svg-icon"
-              iconsize="small"
               title="New Scan Config"
             >
               <svg
@@ -922,7 +918,6 @@ exports[`ScanConfigsPage tests should render full ScanConfigsPage 1`] = `
             <span
               class="c5 c7 c6"
               data-testid="svg-icon"
-              iconsize="small"
               title="Import Scan Config"
             >
               <svg
@@ -947,7 +942,6 @@ exports[`ScanConfigsPage tests should render full ScanConfigsPage 1`] = `
               >
                 <div
                   class="c11 c4 c12"
-                  margin="5px"
                 >
                   <div
                     class="c11"
@@ -979,12 +973,10 @@ exports[`ScanConfigsPage tests should render full ScanConfigsPage 1`] = `
                   >
                     <div
                       class="c11 c4"
-                      margin="5px"
                     >
                       <span
                         class="c5 c7 c6"
                         data-testid="svg-icon"
-                        iconsize="small"
                         title="Update Filter"
                       >
                         <svg
@@ -996,7 +988,6 @@ exports[`ScanConfigsPage tests should render full ScanConfigsPage 1`] = `
                       <span
                         class="c5 c7 c6"
                         data-testid="svg-icon"
-                        iconsize="small"
                         title="Remove Filter"
                       >
                         <svg
@@ -1008,7 +999,6 @@ exports[`ScanConfigsPage tests should render full ScanConfigsPage 1`] = `
                       <span
                         class="c5 c7 c6"
                         data-testid="svg-icon"
-                        iconsize="small"
                         title="Reset to Default Filter"
                       >
                         <svg
@@ -1025,7 +1015,6 @@ exports[`ScanConfigsPage tests should render full ScanConfigsPage 1`] = `
                         <span
                           class="c5 c6"
                           data-testid="svg-icon"
-                          iconsize="small"
                           title="Help: Powerfilter"
                         >
                           <svg
@@ -1038,7 +1027,6 @@ exports[`ScanConfigsPage tests should render full ScanConfigsPage 1`] = `
                       <span
                         class="c5 c7 c6"
                         data-testid="svg-icon"
-                        iconsize="small"
                         title="Edit Filter"
                       >
                         <svg
@@ -1084,7 +1072,6 @@ exports[`ScanConfigsPage tests should render full ScanConfigsPage 1`] = `
                       <span
                         class="c23 c24"
                         data-testid="select-open-button"
-                        iconsize="small"
                       >
                         ▼
                       </span>
@@ -1161,7 +1148,6 @@ exports[`ScanConfigsPage tests should render full ScanConfigsPage 1`] = `
                 >
                   <div
                     class="c2 c4"
-                    margin="5px"
                   >
                     <span
                       class="c5 c38 c6"
@@ -1197,7 +1183,6 @@ exports[`ScanConfigsPage tests should render full ScanConfigsPage 1`] = `
                 >
                   <div
                     class="c2 c4"
-                    margin="5px"
                   >
                     <span
                       class="c5 c38 c6"
@@ -1424,7 +1409,6 @@ exports[`ScanConfigsPage tests should render full ScanConfigsPage 1`] = `
                       >
                         <div
                           class="c54 c4"
-                          margin="5px"
                         >
                           <span
                             class="c5 c7 c6"
@@ -1489,7 +1473,6 @@ exports[`ScanConfigsPage tests should render full ScanConfigsPage 1`] = `
                       >
                         <div
                           class="c2 c4"
-                          margin="5px"
                         >
                           <div
                             aria-expanded="false"
@@ -1541,7 +1524,6 @@ exports[`ScanConfigsPage tests should render full ScanConfigsPage 1`] = `
                           >
                             <div
                               class="c2 c4"
-                              margin="5px"
                             >
                               <span
                                 class="c5 c7 c6"
@@ -1601,7 +1583,6 @@ exports[`ScanConfigsPage tests should render full ScanConfigsPage 1`] = `
                 >
                   <div
                     class="c2 c4"
-                    margin="5px"
                   >
                     <span
                       class="c5 c38 c6"
@@ -1637,7 +1618,6 @@ exports[`ScanConfigsPage tests should render full ScanConfigsPage 1`] = `
                 >
                   <div
                     class="c2 c4"
-                    margin="5px"
                   >
                     <span
                       class="c5 c38 c6"
diff --git a/src/web/pages/scanconfigs/__tests__/__snapshots__/row.js.snap b/src/web/pages/scanconfigs/__tests__/__snapshots__/row.js.snap
index 66c7777fb9..6858def9c6 100644
--- a/src/web/pages/scanconfigs/__tests__/__snapshots__/row.js.snap
+++ b/src/web/pages/scanconfigs/__tests__/__snapshots__/row.js.snap
@@ -254,7 +254,6 @@ exports[`Scan Config row tests should render 1`] = `
           >
             <div
               class="c8 c9"
-              margin="5px"
             >
               <span
                 class="c3 c10 c4"
diff --git a/src/web/pages/scanconfigs/__tests__/__snapshots__/table.js.snap b/src/web/pages/scanconfigs/__tests__/__snapshots__/table.js.snap
index e26413ba7f..ee6ff2f8c3 100644
--- a/src/web/pages/scanconfigs/__tests__/__snapshots__/table.js.snap
+++ b/src/web/pages/scanconfigs/__tests__/__snapshots__/table.js.snap
@@ -483,7 +483,7 @@ exports[`Scan Config table tests should render 1`] = `
   .c18 {
     color: #000;
     font-size: 1.2em;
-    background-color: none;
+    background-color: transparent;
     font-weight: bold;
   }
 }
@@ -492,7 +492,7 @@ exports[`Scan Config table tests should render 1`] = `
   .c19 {
     color: #000;
     font-size: 1.2em;
-    background-color: none;
+    background-color: transparent;
     font-weight: bold;
   }
 }
@@ -501,7 +501,7 @@ exports[`Scan Config table tests should render 1`] = `
   .c20 {
     color: #000;
     font-size: 1.2em;
-    background-color: none;
+    background-color: transparent;
     font-weight: bold;
   }
 }
@@ -510,7 +510,7 @@ exports[`Scan Config table tests should render 1`] = `
   .c22 {
     color: #000;
     font-size: 1.2em;
-    background-color: none;
+    background-color: transparent;
     font-weight: bold;
   }
 }
@@ -557,7 +557,6 @@ exports[`Scan Config table tests should render 1`] = `
           >
             <div
               class="c9 c11"
-              margin="5px"
             >
               <span
                 class="c3 c12 c5"
@@ -593,7 +592,6 @@ exports[`Scan Config table tests should render 1`] = `
           >
             <div
               class="c9 c11"
-              margin="5px"
             >
               <span
                 class="c3 c12 c5"
@@ -800,7 +798,6 @@ exports[`Scan Config table tests should render 1`] = `
                 >
                   <div
                     class="c27 c11"
-                    margin="5px"
                   >
                     <span
                       class="c3 c4 c5"
@@ -940,7 +937,6 @@ exports[`Scan Config table tests should render 1`] = `
                 >
                   <div
                     class="c27 c11"
-                    margin="5px"
                   >
                     <span
                       class="c3 c4 c5"
@@ -1080,7 +1076,6 @@ exports[`Scan Config table tests should render 1`] = `
                 >
                   <div
                     class="c27 c11"
-                    margin="5px"
                   >
                     <span
                       class="c3 c4 c5"
@@ -1145,7 +1140,6 @@ exports[`Scan Config table tests should render 1`] = `
                 >
                   <div
                     class="c9 c11"
-                    margin="5px"
                   >
                     <div
                       aria-expanded="false"
@@ -1194,7 +1188,6 @@ exports[`Scan Config table tests should render 1`] = `
                     >
                       <div
                         class="c9 c11"
-                        margin="5px"
                       >
                         <span
                           class="c3 c5"
@@ -1245,7 +1238,6 @@ exports[`Scan Config table tests should render 1`] = `
           >
             <div
               class="c9 c11"
-              margin="5px"
             >
               <span
                 class="c3 c12 c5"
@@ -1281,7 +1273,6 @@ exports[`Scan Config table tests should render 1`] = `
           >
             <div
               class="c9 c11"
-              margin="5px"
             >
               <span
                 class="c3 c12 c5"
diff --git a/src/web/pages/scanners/__tests__/__snapshots__/dialog.js.snap b/src/web/pages/scanners/__tests__/__snapshots__/dialog.js.snap
index 8dc2cfb075..1908b13c0d 100644
--- a/src/web/pages/scanners/__tests__/__snapshots__/dialog.js.snap
+++ b/src/web/pages/scanners/__tests__/__snapshots__/dialog.js.snap
@@ -575,7 +575,6 @@ exports[`ScannerDialog component tests should render 1`] = `
               <div
                 class="c9"
                 data-testid="save-dialog-content"
-                maxheight="400px"
               >
                 <div
                   class="c10"
@@ -586,15 +585,12 @@ exports[`ScannerDialog component tests should render 1`] = `
                     <label
                       class="c12"
                       data-testid="formgroup-title"
-                      titleoffset="0"
-                      titlesize="2"
                     >
                       Name
                     </label>
                     <div
                       class="c13 c14"
                       data-testid="formgroup-content"
-                      size="10"
                     >
                       <input
                         class="c15 c16"
@@ -616,15 +612,12 @@ exports[`ScannerDialog component tests should render 1`] = `
                     <label
                       class="c12"
                       data-testid="formgroup-title"
-                      titleoffset="0"
-                      titlesize="2"
                     >
                       Comment
                     </label>
                     <div
                       class="c13 c14"
                       data-testid="formgroup-content"
-                      size="10"
                     >
                       <input
                         class="c15 c16"
@@ -646,15 +639,12 @@ exports[`ScannerDialog component tests should render 1`] = `
                     <label
                       class="c12"
                       data-testid="formgroup-title"
-                      titleoffset="0"
-                      titlesize="2"
                     >
                       Type
                     </label>
                     <div
                       class="c13 c14"
                       data-testid="formgroup-content"
-                      size="10"
                     >
                       <div
                         aria-expanded="false"
@@ -709,15 +699,12 @@ exports[`ScannerDialog component tests should render 1`] = `
                     <label
                       class="c12"
                       data-testid="formgroup-title"
-                      titleoffset="0"
-                      titlesize="2"
                     >
                       Host
                     </label>
                     <div
                       class="c13 c14"
                       data-testid="formgroup-content"
-                      size="10"
                     >
                       <input
                         class="c15 c16"
diff --git a/src/web/pages/scanners/component.js b/src/web/pages/scanners/component.js
index 08ae76f5d8..4a1f65b760 100644
--- a/src/web/pages/scanners/component.js
+++ b/src/web/pages/scanners/component.js
@@ -52,9 +52,8 @@ class ScannerComponent extends React.Component {
       scannerDialogVisible: false,
     };
 
-    this.handleCloseCredentialsDialog = this.handleCloseCredentialsDialog.bind(
-      this,
-    );
+    this.handleCloseCredentialsDialog =
+      this.handleCloseCredentialsDialog.bind(this);
     this.handleCloseScannerDialog = this.handleCloseScannerDialog.bind(this);
     this.openCredentialsDialog = this.openCredentialsDialog.bind(this);
     this.openScannerDialog = this.openScannerDialog.bind(this);
@@ -202,19 +201,10 @@ class ScannerComponent extends React.Component {
   }
 
   handleDownloadCertificate(scanner) {
-    const {
-      detailsExportFileName,
-      username,
-      onCertificateDownloaded,
-    } = this.props;
-    const {
-      creationTime,
-      entityType,
-      id,
-      modificationTime,
-      name,
-      ca_pub,
-    } = scanner;
+    const {detailsExportFileName, username, onCertificateDownloaded} =
+      this.props;
+    const {creationTime, entityType, id, modificationTime, name, ca_pub} =
+      scanner;
     const filename = generateFilename({
       creationTime: creationTime,
       extension: 'pem',
@@ -369,7 +359,7 @@ class ScannerComponent extends React.Component {
 
 ScannerComponent.propTypes = {
   children: PropTypes.func.isRequired,
-  detailsExportFileName: PropTypes.object,
+  detailsExportFileName: PropTypes.string,
   gmp: PropTypes.gmp.isRequired,
   username: PropTypes.string,
   onCertificateDownloadError: PropTypes.func,
diff --git a/src/web/pages/tasks/__tests__/__snapshots__/actions.js.snap b/src/web/pages/tasks/__tests__/__snapshots__/actions.js.snap
index 4345ea6d38..83a1b30adb 100644
--- a/src/web/pages/tasks/__tests__/__snapshots__/actions.js.snap
+++ b/src/web/pages/tasks/__tests__/__snapshots__/actions.js.snap
@@ -128,7 +128,6 @@ exports[`Task Actions tests should render 1`] = `
         >
           <div
             class="c3 c4"
-            margin="5px"
           >
             <span
               class="c5 c6 c7"
diff --git a/src/web/pages/tasks/__tests__/__snapshots__/autodeletereportsgroup.js.snap b/src/web/pages/tasks/__tests__/__snapshots__/autodeletereportsgroup.js.snap
index 6795b3529a..1e2848066d 100644
--- a/src/web/pages/tasks/__tests__/__snapshots__/autodeletereportsgroup.js.snap
+++ b/src/web/pages/tasks/__tests__/__snapshots__/autodeletereportsgroup.js.snap
@@ -221,15 +221,12 @@ exports[`AutoDeleteReportsGroup tests should render dialog group 1`] = `
   <label
     class="c1"
     data-testid="formgroup-title"
-    titleoffset="0"
-    titlesize="2"
   >
     Auto Delete Reports
   </label>
   <div
     class="c2 c3"
     data-testid="formgroup-content"
-    size="10"
   >
     <label
       class="c4"
@@ -239,7 +236,6 @@ exports[`AutoDeleteReportsGroup tests should render dialog group 1`] = `
       >
         <div
           class="c5 c7"
-          margin="5px"
         >
           <input
             class="c8 c9"
@@ -262,7 +258,6 @@ exports[`AutoDeleteReportsGroup tests should render dialog group 1`] = `
     >
       <div
         class="c5 c7"
-        margin="5px"
       >
         <label
           class="c4"
@@ -272,7 +267,6 @@ exports[`AutoDeleteReportsGroup tests should render dialog group 1`] = `
           >
             <div
               class="c5 c7"
-              margin="5px"
             >
               <input
                 checked=""
diff --git a/src/web/pages/tasks/__tests__/__snapshots__/containerdialog.js.snap b/src/web/pages/tasks/__tests__/__snapshots__/containerdialog.js.snap
index 2ebefa0527..8c9ca3f4a2 100644
--- a/src/web/pages/tasks/__tests__/__snapshots__/containerdialog.js.snap
+++ b/src/web/pages/tasks/__tests__/__snapshots__/containerdialog.js.snap
@@ -455,7 +455,6 @@ exports[`ContainerDialog tests should render create dialog 1`] = `
               <div
                 class="c9"
                 data-testid="save-dialog-content"
-                maxheight="400px"
               >
                 <div
                   class="c10"
@@ -466,15 +465,12 @@ exports[`ContainerDialog tests should render create dialog 1`] = `
                     <label
                       class="c12"
                       data-testid="formgroup-title"
-                      titleoffset="0"
-                      titlesize="2"
                     >
                       Name
                     </label>
                     <div
                       class="c13 c14"
                       data-testid="formgroup-content"
-                      size="10"
                     >
                       <input
                         class="c15 c16"
@@ -497,15 +493,12 @@ exports[`ContainerDialog tests should render create dialog 1`] = `
                     <label
                       class="c12"
                       data-testid="formgroup-title"
-                      titleoffset="0"
-                      titlesize="2"
                     >
                       Comment
                     </label>
                     <div
                       class="c13 c14"
                       data-testid="formgroup-content"
-                      size="10"
                     >
                       <input
                         class="c15 c16"
@@ -1085,7 +1078,6 @@ exports[`ContainerDialog tests should render edit dialog 1`] = `
               <div
                 class="c9"
                 data-testid="save-dialog-content"
-                maxheight="400px"
               >
                 <div
                   class="c10"
@@ -1096,15 +1088,12 @@ exports[`ContainerDialog tests should render edit dialog 1`] = `
                     <label
                       class="c12"
                       data-testid="formgroup-title"
-                      titleoffset="0"
-                      titlesize="2"
                     >
                       Name
                     </label>
                     <div
                       class="c13 c14"
                       data-testid="formgroup-content"
-                      size="10"
                     >
                       <input
                         class="c15 c16"
@@ -1127,15 +1116,12 @@ exports[`ContainerDialog tests should render edit dialog 1`] = `
                     <label
                       class="c12"
                       data-testid="formgroup-title"
-                      titleoffset="0"
-                      titlesize="2"
                     >
                       Comment
                     </label>
                     <div
                       class="c13 c14"
                       data-testid="formgroup-content"
-                      size="10"
                     >
                       <input
                         class="c15 c16"
@@ -1158,15 +1144,12 @@ exports[`ContainerDialog tests should render edit dialog 1`] = `
                     <label
                       class="c12"
                       data-testid="formgroup-title"
-                      titleoffset="0"
-                      titlesize="2"
                     >
                       Add results to Assets
                     </label>
                     <div
                       class="c13 c14"
                       data-testid="formgroup-content"
-                      size="10"
                     >
                       <div
                         class="c13"
@@ -1176,7 +1159,6 @@ exports[`ContainerDialog tests should render edit dialog 1`] = `
                         >
                           <div
                             class="c13 c19"
-                            margin="5px"
                           >
                             <label
                               class="c20"
@@ -1186,7 +1168,6 @@ exports[`ContainerDialog tests should render edit dialog 1`] = `
                               >
                                 <div
                                   class="c13 c19"
-                                  margin="5px"
                                 >
                                   <input
                                     checked=""
@@ -1213,7 +1194,6 @@ exports[`ContainerDialog tests should render edit dialog 1`] = `
                               >
                                 <div
                                   class="c13 c19"
-                                  margin="5px"
                                 >
                                   <input
                                     class="c21 c22"
diff --git a/src/web/pages/tasks/__tests__/__snapshots__/details.js.snap b/src/web/pages/tasks/__tests__/__snapshots__/details.js.snap
index 370f50a18c..c5005d38a2 100644
--- a/src/web/pages/tasks/__tests__/__snapshots__/details.js.snap
+++ b/src/web/pages/tasks/__tests__/__snapshots__/details.js.snap
@@ -155,7 +155,6 @@ exports[`Task Details tests should render full task details 1`] = `
       >
         <div
           class="c3 c5 c6"
-          margin="5px"
         >
           <span>
             <a
diff --git a/src/web/pages/tasks/__tests__/__snapshots__/detailspage.js.snap b/src/web/pages/tasks/__tests__/__snapshots__/detailspage.js.snap
index 7e50827497..e5dbce1d4a 100644
--- a/src/web/pages/tasks/__tests__/__snapshots__/detailspage.js.snap
+++ b/src/web/pages/tasks/__tests__/__snapshots__/detailspage.js.snap
@@ -397,6 +397,10 @@ exports[`Task Detailspage tests should render full Detailspage 1`] = `
   border-top: 2px solid #11ab51;
 }
 
+.c35 :hover {
+  border-top: 2px solid #fff;
+}
+
 .c35 :first-child {
   border-left: 1px solid #e5e5e5;
 }
@@ -704,14 +708,12 @@ exports[`Task Detailspage tests should render full Detailspage 1`] = `
     >
       <div
         class="c2 c4"
-        margin="10px"
       >
         <div
           class="c2 c3"
         >
           <div
             class="c5 c6"
-            margin="5px"
           >
             <a
               href="test/en/scanning.html#managing-tasks"
@@ -721,7 +723,6 @@ exports[`Task Detailspage tests should render full Detailspage 1`] = `
               <span
                 class="c7 c8"
                 data-testid="svg-icon"
-                iconsize="small"
                 title="Help: Tasks"
               >
                 <svg
@@ -738,7 +739,6 @@ exports[`Task Detailspage tests should render full Detailspage 1`] = `
               <span
                 class="c7 c8"
                 data-testid="svg-icon"
-                iconsize="small"
                 title="Task List"
               >
                 <svg
@@ -751,7 +751,6 @@ exports[`Task Detailspage tests should render full Detailspage 1`] = `
             <span
               class="c7 c8"
               data-testid="svg-icon"
-              iconsize="small"
               title="This is an Alterable Task. Reports may not relate to current Scan Config or Target!"
             >
               <svg
@@ -767,7 +766,6 @@ exports[`Task Detailspage tests should render full Detailspage 1`] = `
         >
           <div
             class="c2 c6"
-            margin="5px"
           >
             <span
               class="c10 c11"
@@ -775,7 +773,6 @@ exports[`Task Detailspage tests should render full Detailspage 1`] = `
               <span
                 class="c7 c8"
                 data-testid="svg-icon"
-                iconsize="small"
               >
                 <svg>
                   new.svg
@@ -811,7 +808,6 @@ exports[`Task Detailspage tests should render full Detailspage 1`] = `
             <span
               class="c7 c16 c8"
               data-testid="svg-icon"
-              iconsize="small"
               title="Clone Task"
             >
               <svg
@@ -823,7 +819,6 @@ exports[`Task Detailspage tests should render full Detailspage 1`] = `
             <span
               class="c7 c16 c8"
               data-testid="svg-icon"
-              iconsize="small"
               title="Edit Task"
             >
               <svg
@@ -835,7 +830,6 @@ exports[`Task Detailspage tests should render full Detailspage 1`] = `
             <span
               class="c7 c16 c8"
               data-testid="svg-icon"
-              iconsize="small"
               title="Move Task to trashcan"
             >
               <svg
@@ -847,7 +841,6 @@ exports[`Task Detailspage tests should render full Detailspage 1`] = `
             <span
               class="c7 c16 c8"
               data-testid="svg-icon"
-              iconsize="small"
               title="Export Task as XML"
             >
               <svg
@@ -863,12 +856,10 @@ exports[`Task Detailspage tests should render full Detailspage 1`] = `
         >
           <div
             class="c2 c6"
-            margin="5px"
           >
             <span
               class="c7 c16 c8"
               data-testid="svg-icon"
-              iconsize="small"
               title="Start"
             >
               <svg
@@ -881,7 +872,6 @@ exports[`Task Detailspage tests should render full Detailspage 1`] = `
               alt="Resume"
               class="c7 c17 c8"
               data-testid="svg-icon"
-              iconsize="small"
               title="Task is not stopped"
             >
               <svg
@@ -897,14 +887,12 @@ exports[`Task Detailspage tests should render full Detailspage 1`] = `
         >
           <div
             class="c2 c4"
-            margin="10px"
           >
             <div
               class="c2 c3"
             >
               <div
                 class="c2 c6"
-                margin="5px"
               >
                 <a
                   class="c9"
@@ -915,7 +903,6 @@ exports[`Task Detailspage tests should render full Detailspage 1`] = `
                   <span
                     class="c7 c8"
                     data-testid="svg-icon"
-                    iconsize="small"
                   >
                     <svg>
                       report.svg
@@ -929,12 +916,10 @@ exports[`Task Detailspage tests should render full Detailspage 1`] = `
                 >
                   <div
                     class="c18"
-                    margin="0"
                   >
                     <span
                       class="c7 c8"
                       data-testid="svg-icon"
-                      iconsize="small"
                     >
                       <svg>
                         report.svg
@@ -943,7 +928,6 @@ exports[`Task Detailspage tests should render full Detailspage 1`] = `
                     <span
                       class="c19"
                       data-testid="badge-icon"
-                      margin="0"
                     >
                       1
                     </span>
@@ -958,12 +942,10 @@ exports[`Task Detailspage tests should render full Detailspage 1`] = `
             >
               <div
                 class="c18"
-                margin="0"
               >
                 <span
                   class="c7 c8"
                   data-testid="svg-icon"
-                  iconsize="small"
                 >
                   <svg>
                     result.svg
@@ -972,7 +954,6 @@ exports[`Task Detailspage tests should render full Detailspage 1`] = `
                 <span
                   class="c19"
                   data-testid="badge-icon"
-                  margin="0"
                 >
                   1
                 </span>
@@ -983,7 +964,6 @@ exports[`Task Detailspage tests should render full Detailspage 1`] = `
             >
               <div
                 class="c2 c6"
-                margin="5px"
               >
                 <a
                   class="c9"
@@ -992,12 +972,10 @@ exports[`Task Detailspage tests should render full Detailspage 1`] = `
                 >
                   <div
                     class="c18"
-                    margin="0"
                   >
                     <span
                       class="c7 c8"
                       data-testid="svg-icon"
-                      iconsize="small"
                     >
                       <svg>
                         note.svg
@@ -1006,7 +984,6 @@ exports[`Task Detailspage tests should render full Detailspage 1`] = `
                     <span
                       class="c19"
                       data-testid="badge-icon"
-                      margin="0"
                     >
                       0
                     </span>
@@ -1019,12 +996,10 @@ exports[`Task Detailspage tests should render full Detailspage 1`] = `
                 >
                   <div
                     class="c18"
-                    margin="0"
                   >
                     <span
                       class="c7 c8"
                       data-testid="svg-icon"
-                      iconsize="small"
                     >
                       <svg>
                         override.svg
@@ -1033,7 +1008,6 @@ exports[`Task Detailspage tests should render full Detailspage 1`] = `
                     <span
                       class="c19"
                       data-testid="badge-icon"
-                      margin="0"
                     >
                       0
                     </span>
@@ -1251,7 +1225,6 @@ exports[`Task Detailspage tests should render full Detailspage 1`] = `
                     href="/report/1234"
                   >
                     <div
-                      boxbackground="#4C4C4C"
                       class="c45"
                       data-testid="progressbar-box"
                       title="Done"
@@ -1260,7 +1233,6 @@ exports[`Task Detailspage tests should render full Detailspage 1`] = `
                         background="low"
                         class="c46"
                         data-testid="progress"
-                        progress="100"
                       />
                       <div
                         class="c47"
@@ -1309,7 +1281,6 @@ exports[`Task Detailspage tests should render full Detailspage 1`] = `
               >
                 <div
                   class="c2 c6 c49"
-                  margin="5px"
                 >
                   <span>
                     <a
@@ -1790,14 +1761,12 @@ exports[`Task ToolBarIcons tests should render 1`] = `
 >
   <div
     class="c0 c2"
-    margin="10px"
   >
     <div
       class="c0 c1"
     >
       <div
         class="c3 c4"
-        margin="5px"
       >
         <a
           href="test/en/scanning.html#managing-tasks"
@@ -1850,7 +1819,6 @@ exports[`Task ToolBarIcons tests should render 1`] = `
     >
       <div
         class="c0 c4"
-        margin="5px"
       >
         <span
           class="c8 c9"
@@ -1941,7 +1909,6 @@ exports[`Task ToolBarIcons tests should render 1`] = `
     >
       <div
         class="c0 c4"
-        margin="5px"
       >
         <span
           class="c5 c14 c6"
@@ -1973,14 +1940,12 @@ exports[`Task ToolBarIcons tests should render 1`] = `
     >
       <div
         class="c0 c2"
-        margin="10px"
       >
         <div
           class="c0 c1"
         >
           <div
             class="c0 c4"
-            margin="5px"
           >
             <a
               class="c7"
@@ -2004,7 +1969,6 @@ exports[`Task ToolBarIcons tests should render 1`] = `
             >
               <div
                 class="c16"
-                margin="0"
               >
                 <span
                   class="c5 c6"
@@ -2017,7 +1981,6 @@ exports[`Task ToolBarIcons tests should render 1`] = `
                 <span
                   class="c17"
                   data-testid="badge-icon"
-                  margin="0"
                 >
                   1
                 </span>
@@ -2032,7 +1995,6 @@ exports[`Task ToolBarIcons tests should render 1`] = `
         >
           <div
             class="c16"
-            margin="0"
           >
             <span
               class="c5 c6"
@@ -2045,7 +2007,6 @@ exports[`Task ToolBarIcons tests should render 1`] = `
             <span
               class="c17"
               data-testid="badge-icon"
-              margin="0"
             >
               1
             </span>
@@ -2056,7 +2017,6 @@ exports[`Task ToolBarIcons tests should render 1`] = `
         >
           <div
             class="c0 c4"
-            margin="5px"
           >
             <a
               class="c7"
@@ -2065,7 +2025,6 @@ exports[`Task ToolBarIcons tests should render 1`] = `
             >
               <div
                 class="c16"
-                margin="0"
               >
                 <span
                   class="c5 c6"
@@ -2078,7 +2037,6 @@ exports[`Task ToolBarIcons tests should render 1`] = `
                 <span
                   class="c17"
                   data-testid="badge-icon"
-                  margin="0"
                 >
                   2
                 </span>
@@ -2091,7 +2049,6 @@ exports[`Task ToolBarIcons tests should render 1`] = `
             >
               <div
                 class="c16"
-                margin="0"
               >
                 <span
                   class="c5 c6"
@@ -2104,7 +2061,6 @@ exports[`Task ToolBarIcons tests should render 1`] = `
                 <span
                   class="c17"
                   data-testid="badge-icon"
-                  margin="0"
                 >
                   3
                 </span>
diff --git a/src/web/pages/tasks/__tests__/__snapshots__/listpage.js.snap b/src/web/pages/tasks/__tests__/__snapshots__/listpage.js.snap
index 5c31ef9dd2..3c4195a63f 100644
--- a/src/web/pages/tasks/__tests__/__snapshots__/listpage.js.snap
+++ b/src/web/pages/tasks/__tests__/__snapshots__/listpage.js.snap
@@ -158,7 +158,6 @@ exports[`TaskPage ToolBarIcons test should render 1`] = `
 >
   <div
     class="c0 c2"
-    margin="5px"
   >
     <a
       href="test/en/scanning.html#managing-tasks"
diff --git a/src/web/pages/tasks/__tests__/__snapshots__/row.js.snap b/src/web/pages/tasks/__tests__/__snapshots__/row.js.snap
index f632f938af..bc6bb9a1c6 100644
--- a/src/web/pages/tasks/__tests__/__snapshots__/row.js.snap
+++ b/src/web/pages/tasks/__tests__/__snapshots__/row.js.snap
@@ -294,7 +294,6 @@ exports[`Task Row tests should render 1`] = `
             >
               <div
                 class="c3 c5"
-                margin="5px"
               />
             </div>
           </div>
@@ -317,7 +316,6 @@ exports[`Task Row tests should render 1`] = `
             href="/report/1234"
           >
             <div
-              boxbackground="#4C4C4C"
               class="c8"
               data-testid="progressbar-box"
               title="Done"
@@ -326,7 +324,6 @@ exports[`Task Row tests should render 1`] = `
                 background="low"
                 class="c9"
                 data-testid="progress"
-                progress="100"
               />
               <div
                 class="c10"
@@ -378,7 +375,6 @@ exports[`Task Row tests should render 1`] = `
           class="c0"
         >
           <div
-            boxbackground="#4C4C4C"
             class="c8"
             data-testid="progressbar-box"
             title="Medium"
@@ -387,7 +383,6 @@ exports[`Task Row tests should render 1`] = `
               background="warn"
               class="c12"
               data-testid="progress"
-              progress="50"
             />
             <div
               class="c10"
@@ -424,7 +419,6 @@ exports[`Task Row tests should render 1`] = `
           >
             <div
               class="c18 c5"
-              margin="5px"
             >
               <span
                 class="c14 c19 c15"
diff --git a/src/web/pages/tasks/__tests__/__snapshots__/status.js.snap b/src/web/pages/tasks/__tests__/__snapshots__/status.js.snap
index 44bfbf1b80..c40d9cf1d4 100644
--- a/src/web/pages/tasks/__tests__/__snapshots__/status.js.snap
+++ b/src/web/pages/tasks/__tests__/__snapshots__/status.js.snap
@@ -67,7 +67,6 @@ exports[`Task Status tests should render 1`] = `
   class="c0 c1"
 >
   <div
-    boxbackground="#4C4C4C"
     class="c2"
     data-testid="progressbar-box"
     title="New"
@@ -76,7 +75,6 @@ exports[`Task Status tests should render 1`] = `
       background="new"
       class="c3"
       data-testid="progress"
-      progress="100"
     />
     <div
       class="c4"
diff --git a/src/web/pages/tasks/__tests__/__snapshots__/table.js.snap b/src/web/pages/tasks/__tests__/__snapshots__/table.js.snap
index 3a1911acac..3b62f41abd 100644
--- a/src/web/pages/tasks/__tests__/__snapshots__/table.js.snap
+++ b/src/web/pages/tasks/__tests__/__snapshots__/table.js.snap
@@ -580,7 +580,7 @@ exports[`Tasks table tests should render 1`] = `
   .c18 {
     color: #000;
     font-size: 1.2em;
-    background-color: none;
+    background-color: transparent;
     font-weight: bold;
   }
 }
@@ -589,7 +589,7 @@ exports[`Tasks table tests should render 1`] = `
   .c19 {
     color: #000;
     font-size: 1.2em;
-    background-color: none;
+    background-color: transparent;
     font-weight: bold;
   }
 }
@@ -598,7 +598,7 @@ exports[`Tasks table tests should render 1`] = `
   .c20 {
     color: #000;
     font-size: 1.2em;
-    background-color: none;
+    background-color: transparent;
     font-weight: bold;
   }
 }
@@ -607,7 +607,7 @@ exports[`Tasks table tests should render 1`] = `
   .c21 {
     color: #000;
     font-size: 1.2em;
-    background-color: none;
+    background-color: transparent;
     font-weight: bold;
   }
 }
@@ -616,7 +616,7 @@ exports[`Tasks table tests should render 1`] = `
   .c22 {
     color: #000;
     font-size: 1.2em;
-    background-color: none;
+    background-color: transparent;
     font-weight: bold;
   }
 }
@@ -625,7 +625,7 @@ exports[`Tasks table tests should render 1`] = `
   .c24 {
     color: #000;
     font-size: 1.2em;
-    background-color: none;
+    background-color: transparent;
     font-weight: bold;
   }
 }
@@ -715,7 +715,6 @@ exports[`Tasks table tests should render 1`] = `
           >
             <div
               class="c9 c11"
-              margin="5px"
             >
               <span
                 class="c3 c12 c5"
@@ -751,7 +750,6 @@ exports[`Tasks table tests should render 1`] = `
           >
             <div
               class="c9 c11"
-              margin="5px"
             >
               <span
                 class="c3 c12 c5"
@@ -873,7 +871,6 @@ exports[`Tasks table tests should render 1`] = `
                   >
                     <div
                       class="c9 c11"
-                      margin="5px"
                     />
                   </div>
                 </div>
@@ -896,7 +893,6 @@ exports[`Tasks table tests should render 1`] = `
                   href="/report/1234"
                 >
                   <div
-                    boxbackground="#4C4C4C"
                     class="c30"
                     data-testid="progressbar-box"
                     title="Done"
@@ -905,7 +901,6 @@ exports[`Tasks table tests should render 1`] = `
                       background="low"
                       class="c31"
                       data-testid="progress"
-                      progress="100"
                     />
                     <div
                       class="c32"
@@ -957,7 +952,6 @@ exports[`Tasks table tests should render 1`] = `
                 class="c25"
               >
                 <div
-                  boxbackground="#4C4C4C"
                   class="c30"
                   data-testid="progressbar-box"
                   title="Medium"
@@ -966,7 +960,6 @@ exports[`Tasks table tests should render 1`] = `
                     background="warn"
                     class="c34"
                     data-testid="progress"
-                    progress="50"
                   />
                   <div
                     class="c32"
@@ -992,7 +985,6 @@ exports[`Tasks table tests should render 1`] = `
                 >
                   <div
                     class="c37 c11"
-                    margin="5px"
                   >
                     <span
                       class="c3 c4 c5"
@@ -1085,7 +1077,6 @@ exports[`Tasks table tests should render 1`] = `
                   >
                     <div
                       class="c9 c11"
-                      margin="5px"
                     >
                       <span
                         alt="Task owned by user"
@@ -1119,7 +1110,6 @@ exports[`Tasks table tests should render 1`] = `
                   class="c28 c29"
                 >
                   <div
-                    boxbackground="#4C4C4C"
                     class="c30"
                     data-testid="progressbar-box"
                     title="New"
@@ -1128,7 +1118,6 @@ exports[`Tasks table tests should render 1`] = `
                       background="new"
                       class="c38"
                       data-testid="progress"
-                      progress="100"
                     />
                     <div
                       class="c32"
@@ -1174,7 +1163,6 @@ exports[`Tasks table tests should render 1`] = `
                 >
                   <div
                     class="c37 c11"
-                    margin="5px"
                   >
                     <span
                       class="c3 c4 c5"
@@ -1267,7 +1255,6 @@ exports[`Tasks table tests should render 1`] = `
                   >
                     <div
                       class="c9 c11"
-                      margin="5px"
                     >
                       <span
                         alt="Task owned by user"
@@ -1303,7 +1290,6 @@ exports[`Tasks table tests should render 1`] = `
                   href="/report/5678"
                 >
                   <div
-                    boxbackground="#4C4C4C"
                     class="c30"
                     data-testid="progressbar-box"
                     title="Running"
@@ -1312,7 +1298,6 @@ exports[`Tasks table tests should render 1`] = `
                       background="run"
                       class="c39"
                       data-testid="progress"
-                      progress="0"
                     />
                     <div
                       class="c32"
@@ -1364,7 +1349,6 @@ exports[`Tasks table tests should render 1`] = `
                 class="c25"
               >
                 <div
-                  boxbackground="#4C4C4C"
                   class="c30"
                   data-testid="progressbar-box"
                   title="High"
@@ -1373,7 +1357,6 @@ exports[`Tasks table tests should render 1`] = `
                     background="error"
                     class="c40"
                     data-testid="progress"
-                    progress="100"
                   />
                   <div
                     class="c32"
@@ -1399,7 +1382,6 @@ exports[`Tasks table tests should render 1`] = `
                 >
                   <div
                     class="c37 c11"
-                    margin="5px"
                   >
                     <span
                       class="c3 c4 c5"
@@ -1487,7 +1469,6 @@ exports[`Tasks table tests should render 1`] = `
                 >
                   <div
                     class="c9 c11"
-                    margin="5px"
                   >
                     <div
                       aria-expanded="false"
@@ -1536,7 +1517,6 @@ exports[`Tasks table tests should render 1`] = `
                     >
                       <div
                         class="c9 c11"
-                        margin="5px"
                       >
                         <span
                           class="c3 c5"
@@ -1587,7 +1567,6 @@ exports[`Tasks table tests should render 1`] = `
           >
             <div
               class="c9 c11"
-              margin="5px"
             >
               <span
                 class="c3 c12 c5"
@@ -1623,7 +1602,6 @@ exports[`Tasks table tests should render 1`] = `
           >
             <div
               class="c9 c11"
-              margin="5px"
             >
               <span
                 class="c3 c12 c5"
diff --git a/src/web/pages/tickets/__tests__/__snapshots__/createdialog.js.snap b/src/web/pages/tickets/__tests__/__snapshots__/createdialog.js.snap
index 813e47bd56..c9578ce391 100644
--- a/src/web/pages/tickets/__tests__/__snapshots__/createdialog.js.snap
+++ b/src/web/pages/tickets/__tests__/__snapshots__/createdialog.js.snap
@@ -568,7 +568,6 @@ exports[`CreateTicketDialog component tests should render dialog 1`] = `
               <div
                 class="c9"
                 data-testid="save-dialog-content"
-                maxheight="400px"
               >
                 <div
                   class="c10"
@@ -579,15 +578,12 @@ exports[`CreateTicketDialog component tests should render dialog 1`] = `
                     <label
                       class="c12"
                       data-testid="formgroup-title"
-                      titleoffset="0"
-                      titlesize="2"
                     >
                       Assign To User
                     </label>
                     <div
                       class="c13 c14"
                       data-testid="formgroup-content"
-                      size="10"
                     >
                       <div
                         aria-expanded="false"
@@ -642,15 +638,12 @@ exports[`CreateTicketDialog component tests should render dialog 1`] = `
                     <label
                       class="c12"
                       data-testid="formgroup-title"
-                      titleoffset="0"
-                      titlesize="2"
                     >
                       Note
                     </label>
                     <div
                       class="c13 c14"
                       data-testid="formgroup-content"
-                      size="10"
                     >
                       <textarea
                         class="c24 c25"
diff --git a/src/web/pages/tickets/__tests__/__snapshots__/editdialog.js.snap b/src/web/pages/tickets/__tests__/__snapshots__/editdialog.js.snap
index d5fd845e46..a74ae0f0a7 100644
--- a/src/web/pages/tickets/__tests__/__snapshots__/editdialog.js.snap
+++ b/src/web/pages/tickets/__tests__/__snapshots__/editdialog.js.snap
@@ -568,7 +568,6 @@ exports[`EditTicketDialog component tests should render dialog 1`] = `
               <div
                 class="c9"
                 data-testid="save-dialog-content"
-                maxheight="400px"
               >
                 <div
                   class="c10"
@@ -579,15 +578,12 @@ exports[`EditTicketDialog component tests should render dialog 1`] = `
                     <label
                       class="c12"
                       data-testid="formgroup-title"
-                      titleoffset="0"
-                      titlesize="2"
                     >
                       Status
                     </label>
                     <div
                       class="c13 c14"
                       data-testid="formgroup-content"
-                      size="10"
                     >
                       <div
                         aria-expanded="false"
@@ -642,15 +638,12 @@ exports[`EditTicketDialog component tests should render dialog 1`] = `
                     <label
                       class="c12"
                       data-testid="formgroup-title"
-                      titleoffset="0"
-                      titlesize="2"
                     >
                       Assigned User
                     </label>
                     <div
                       class="c13 c14"
                       data-testid="formgroup-content"
-                      size="10"
                     >
                       <div
                         aria-expanded="false"
@@ -705,15 +698,12 @@ exports[`EditTicketDialog component tests should render dialog 1`] = `
                     <label
                       class="c12"
                       data-testid="formgroup-title"
-                      titleoffset="0"
-                      titlesize="2"
                     >
                       Note for Open
                     </label>
                     <div
                       class="c13 c14"
                       data-testid="formgroup-content"
-                      size="10"
                     >
                       <textarea
                         class="c24 c25"
@@ -734,15 +724,12 @@ exports[`EditTicketDialog component tests should render dialog 1`] = `
                     <label
                       class="c12"
                       data-testid="formgroup-title"
-                      titleoffset="0"
-                      titlesize="2"
                     >
                       Note for Fixed
                     </label>
                     <div
                       class="c13 c14"
                       data-testid="formgroup-content"
-                      size="10"
                     >
                       <textarea
                         class="c24 c25"
@@ -763,15 +750,12 @@ exports[`EditTicketDialog component tests should render dialog 1`] = `
                     <label
                       class="c12"
                       data-testid="formgroup-title"
-                      titleoffset="0"
-                      titlesize="2"
                     >
                       Note for Closed
                     </label>
                     <div
                       class="c13 c14"
                       data-testid="formgroup-content"
-                      size="10"
                     >
                       <textarea
                         class="c24 c25"
diff --git a/src/web/pages/tickets/details.js b/src/web/pages/tickets/details.js
index 9c501fca83..d5550580d6 100644
--- a/src/web/pages/tickets/details.js
+++ b/src/web/pages/tickets/details.js
@@ -185,7 +185,7 @@ const TicketDetails = ({entity, links = true}) => {
 
 TicketDetails.propTypes = {
   entity: PropTypes.model.isRequired,
-  links: PropTypes.bool.isRequired,
+  links: PropTypes.bool,
 };
 
 export default TicketDetails;
diff --git a/src/web/pages/usersettings/usersettingspage.js b/src/web/pages/usersettings/usersettingspage.js
index 5921fa6b56..45eb95ae03 100644
--- a/src/web/pages/usersettings/usersettingspage.js
+++ b/src/web/pages/usersettings/usersettingspage.js
@@ -816,7 +816,7 @@ UserSettings.propTypes = {
   defaultSshCredential: PropTypes.object,
   defaultTarget: PropTypes.object,
   deltaReportsVersion: PropTypes.string,
-  detailsExportFileName: PropTypes.object,
+  detailsExportFileName: PropTypes.string,
   dfnCertFilter: PropTypes.object,
   dynamicSeverity: PropTypes.object,
   filters: PropTypes.array,
diff --git a/src/web/utils/proptypes.js b/src/web/utils/proptypes.js
index 5eccb102d2..83cdbdadac 100644
--- a/src/web/utils/proptypes.js
+++ b/src/web/utils/proptypes.js
@@ -56,18 +56,15 @@ export const mayRequire = validator => {
   return wrapper;
 };
 
-export const deprecated = (validator, message = '') => (
-  props,
-  prop_name,
-  component_name,
-  ...rest
-) => {
-  warning(
-    isDefined(props[prop_name]),
-    `'${prop_name}' is deprecated on ${component_name}. ${message}`,
-  );
-  return validator(props, prop_name, component_name, ...rest);
-};
+export const deprecated =
+  (validator, message = '') =>
+  (props, prop_name, component_name, ...rest) => {
+    warning(
+      isDefined(props[prop_name]),
+      `'${prop_name}' is deprecated on ${component_name}. ${message}`,
+    );
+    return validator(props, prop_name, component_name, ...rest);
+  };
 
 const component = ReactPropTypes.oneOfType([
   ReactPropTypes.func,
@@ -145,6 +142,8 @@ const gmp =
 
 const settings = ReactPropTypes.instanceOf(Settings);
 
+const severityClass = ReactPropTypes.string;
+
 const dateValidator = (props, prop_name, component_name) => {
   const value = props[prop_name];
   if (isDefined(value) && !isDate(value)) {
@@ -258,6 +257,7 @@ const gsaPropTypes = {
   ref,
   set,
   settings,
+  severityClass,
   stringOrFalse,
   timeunit,
   toString,
diff --git a/src/web/utils/render.js b/src/web/utils/render.js
index 2a4490572e..dae0936a1f 100644
--- a/src/web/utils/render.js
+++ b/src/web/utils/render.js
@@ -31,10 +31,11 @@ export const UNSET_VALUE = '0';
 export const UNSET_LABEL = '--';
 
 function selectItemLabel(item) {
+  const itemText = isDefined(item.name) ? item.name : item.id;
   if (item.deprecated) {
-    return <s>{item.name + ' (' + _('Deprecated') + ')'}</s>;
+    return <s>{itemText + ' (' + _('Deprecated') + ')'}</s>;
   }
-  return item.name;
+  return itemText;
 }
 
 /**
diff --git a/src/web/utils/styledConfig.js b/src/web/utils/styledConfig.js
new file mode 100644
index 0000000000..cfe9465cb5
--- /dev/null
+++ b/src/web/utils/styledConfig.js
@@ -0,0 +1,25 @@
+/* Copyright (C) 2023 Greenbone AG
+ *
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Affero General Public License
+ * as published by the Free Software Foundation, either version 3
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+export const excludePropsConfig = excludedProps => {
+  return {
+    shouldForwardProp: prop => {
+      return !excludedProps.includes(prop);
+    },
+  };
+};