diff --git a/components/style/QtDesignerForm.css b/components/style/QtDesignerForm.css
index aafa8d072..d8d15cd1c 100644
--- a/components/style/QtDesignerForm.css
+++ b/components/style/QtDesignerForm.css
@@ -6,21 +6,11 @@ div.qt-designer-form textarea {
     height: 100%;
 }
 
-div.qt-designer-form div.text-input-wrapper,
-div.qt-designer-form div.text-input-wrapper > pre {
-    min-height: 2em;
-}
-
 div.qt-designer-form div.text-input-wrapper-multiline,
 div.qt-designer-form div.text-input-wrapper-multiline > pre {
     height: 100%;
 }
 
-div.qt-designer-form div.TextInput,
-div.qt-designer-form div.TextInput > pre {
-    min-height: 2em;
-}
-
 div.qt-designer-form label > input {
     margin-right: 0.25em;
 }
diff --git a/components/style/SearchBox.css b/components/style/SearchBox.css
index 8b999e763..115a53c95 100644
--- a/components/style/SearchBox.css
+++ b/components/style/SearchBox.css
@@ -12,7 +12,6 @@ div.searchbox-field {
     flex: 1 1 auto;
 }
 
-
 button.searchbox-filter-button {
     flex: 0 0 auto;
     border-left-width: 0;
diff --git a/components/widgets/style/SearchWidget.css b/components/widgets/style/SearchWidget.css
index e7344b8d1..09f0d5d32 100644
--- a/components/widgets/style/SearchWidget.css
+++ b/components/widgets/style/SearchWidget.css
@@ -5,14 +5,13 @@ div.search-widget-container {
 
 div.search-widget-container > input {
     width: 100%;
-    height: 100%!important;
 }
 
 div.search-widget-container > div.spinner,
 div.search-widget-container > span.icon-clear {
     position: absolute;
-    width: calc(2em - 2px);
-    height: calc(2em - 2px);
+    width: 2em;
+    height: 2em;
     right: 0;
     top: 0;
 }
diff --git a/plugins/GeometryDigitizer.jsx b/plugins/GeometryDigitizer.jsx
index 432cfefac..c58bd6041 100644
--- a/plugins/GeometryDigitizer.jsx
+++ b/plugins/GeometryDigitizer.jsx
@@ -248,7 +248,7 @@ class GeometryDigitizer extends React.Component {
                 </div>
                 <div className="redlining-group">
                     <div>{LocaleUtils.tr("geomdigitizer.applink")}</div>
-                    <div className="geometry-digitizer-applink controlgroup">
+                    <div className="controlgroup">
                         <select onChange={ev => this.setState({geomLink: ev.target.value})} value={this.state.geomLink}>
                             <option value="">{LocaleUtils.tr("geomdigitizer.chooselink")}</option>
                             {(this.props.theme.pluginData?.geometryLinks || []).map(entry => (
@@ -263,7 +263,7 @@ class GeometryDigitizer extends React.Component {
                             {Object.entries(geomLinkData.params || {}).map(([key, value]) => (
                                 <input key={key} name={key} type="hidden" value={value} />
                             ))}
-                            <button disabled={!geomLinkData.url || !haveFeatures} type="submit">{LocaleUtils.tr("geomdigitizer.send")}</button>
+                            <button className="button" disabled={!geomLinkData.url || !haveFeatures} type="submit">{LocaleUtils.tr("geomdigitizer.send")}</button>
                         </form>
                     </div>
                 </div>
diff --git a/plugins/style/AttributeTable.css b/plugins/style/AttributeTable.css
index 76b8b1d2a..5e305aa28 100644
--- a/plugins/style/AttributeTable.css
+++ b/plugins/style/AttributeTable.css
@@ -33,19 +33,13 @@ div.dock-window > div.resizeable-window-body > div.attribtable-body {
 div.attribtable-toolbar {
     display: flex;
     align-items: center;
-    padding: 0.25em;
-    flex: 0 0 auto;
+    margin-bottom: 0.125em;
 }
 
 div.attribtable-toolbar > * {
     margin: 0.125em;
 }
 
-div.attribtable-toolbar > select {
-    border: 1px solid var(--border-color);
-    height: 2em;
-}
-
 div.attribtable-contents {
     flex: 1 1 auto;
     background-color: var(--list-bg-color);
diff --git a/plugins/style/Bookmark.css b/plugins/style/Bookmark.css
index b4757ecfb..7699c5881 100644
--- a/plugins/style/Bookmark.css
+++ b/plugins/style/Bookmark.css
@@ -1,23 +1,14 @@
 .bookmark-body {
     padding: 0.5em;
-    height: 100%;
-    overflow-y: hidden;
     display: flex;
     flex-direction: column;
-}
-
-.bookmark-body > h4 {
-    flex: 0 0 auto;
-}
-
-div.bookmark-create {
-    display: flex;
-    flex: 0 0 auto;
+    /* titlebar: 2.5em */
+    max-height: calc(100vh - 2.5em - var(--topbar-height) - var(--bottombar-height)); /* viewport - sidebar_titlebar - topbar - bottombar*/
+    max-height: calc(var(--vh, 1vh) * 100 - 2.5em - var(--topbar-height) - var(--bottombar-height)); /* viewport - sidebar_titlebar - topbar - bottombar*/
 }
 
 div.bookmark-create > input {
-    flex: 1 1 auto;
-    border-radius: 0;
+    width: 100%;
 }
 
 div.bookmark-actions {
@@ -28,13 +19,15 @@ span.bookmark-actions-spacer {
     flex: 1 1 auto;
 }
 
-span.bookmark-actions-buttonbox > button:not(:disabled) > span.icon-trash {
+span.bookmark-actions > button:not(:disabled) > span.icon-trash {
     color: red;
 }
 
 div.bookmark-list {
     border: 1px solid var(--border-color);
     background-color: var(--list-bg-color);
+    flex: 1 1 auto;
+    overflow-y: auto;
 }
 
 div.bookmark-list-item {
diff --git a/plugins/style/GeometryDigitizer.css b/plugins/style/GeometryDigitizer.css
index b4de3a49a..8ab62c8a2 100644
--- a/plugins/style/GeometryDigitizer.css
+++ b/plugins/style/GeometryDigitizer.css
@@ -1,18 +1,3 @@
-div.geometry-digitizer-applink > form {
-    display: inline;
-}
-
-div.geometry-digitizer-applink > select,
-div.geometry-digitizer-applink > form > button {
-    height: 2em;
-    padding: 0.25em;
-    border: 1px solid var(--border-color);
-}
-
-div.geometry-digitizer-applink > form > button:disabled {
-    color: gray;
-}
-
 div.geomdigitizer-output-window-body {
     width: 100%;
     height: 100%;
diff --git a/plugins/style/Portal.css b/plugins/style/Portal.css
index 75517de81..c12eff1f2 100644
--- a/plugins/style/Portal.css
+++ b/plugins/style/Portal.css
@@ -23,11 +23,8 @@ img.portal-logo {
 }
 
 input.portal-search-field {
-    flex: 1 0 auto;
-    height: 2em;
+    flex: 1 1 auto;
     max-width: 70ch;
-    background-color: var(--input-bg-color);
-    border: 1px solid var(--border-color);
 }
 
 span.portal-topbar-spacer {
diff --git a/plugins/style/Routing.css b/plugins/style/Routing.css
index 2e49e4cc0..63b84193e 100644
--- a/plugins/style/Routing.css
+++ b/plugins/style/Routing.css
@@ -5,7 +5,7 @@ div.routing-body {
 }
 
 div.routing-buttonbar {
-    flex: 0 0 auto;
+    margin-bottom: -1px;
 }
 
 div.routing-frame {
diff --git a/plugins/style/TopBar.css b/plugins/style/TopBar.css
index c6ddd1bc7..3539c9978 100644
--- a/plugins/style/TopBar.css
+++ b/plugins/style/TopBar.css
@@ -19,7 +19,6 @@
 #TopBar img.logo {
     width: auto;
     height: 3.0em;
-    flex: 0 0 auto;
     vertical-align: middle;
 }
 
@@ -30,13 +29,8 @@
     align-items: center;
 }
 
-#TopBar div.AppMenu {
-    flex: 0 0 auto;
-}
-
 #TopBar #FullScreenSwitcher {
     height: 3.5em;
-    flex: 0 0 auto;
 }
 
 #TopBar.fullscreen {