diff --git a/frontend/src/app/features/assets/pages/asset-tags.component.html b/frontend/src/app/features/assets/pages/asset-tags.component.html
index 2d082ce7a..21b1b4e64 100644
--- a/frontend/src/app/features/assets/pages/asset-tags.component.html
+++ b/frontend/src/app/features/assets/pages/asset-tags.component.html
@@ -16,7 +16,7 @@
 
                         @if (canRename) {
                             <button
-                                class="btn-sm btn-text-secondary btn-rename"
+                                class="btn btn-sm btn-text-secondary btn-rename"
                                 attr.aria-label="{{ 'common.rename' | sqxTranslate }}"
                                 (click)="renameTag(tag)"
                                 sqxStopClick
diff --git a/frontend/src/app/framework/angular/forms/editors/date-time-editor.component.html b/frontend/src/app/framework/angular/forms/editors/date-time-editor.component.html
index 63bfc5be1..ca795c14f 100644
--- a/frontend/src/app/framework/angular/forms/editors/date-time-editor.component.html
+++ b/frontend/src/app/framework/angular/forms/editors/date-time-editor.component.html
@@ -28,6 +28,7 @@
             (ngModelChange)="updateValue($event)"
             [ngModelOptions]="{ standalone: true }"
             placeholder="{{ 'common.date' | sqxTranslate }}"
+            step="1"
             sqxForwardFormClasses
             [type]="isDateTimeMode ? 'datetime-local' : 'date'" />
     </div>
diff --git a/frontend/src/app/framework/angular/modals/dialog-renderer.component.html b/frontend/src/app/framework/angular/modals/dialog-renderer.component.html
index 786ceae8d..8297869b9 100644
--- a/frontend/src/app/framework/angular/modals/dialog-renderer.component.html
+++ b/frontend/src/app/framework/angular/modals/dialog-renderer.component.html
@@ -28,7 +28,7 @@
             animate.leave="fade-out"
             (click)="close(notification)"
             role="alert">
-            <button class="btn-sm btn-close" data-dismiss="alert" (dialogClose)="close(notification)" type="button"></button>
+            <button class="btn btn-sm btn-close" data-dismiss="alert" (dialogClose)="close(notification)" type="button"></button>
             <div class="timer timer-{{ notification.messageType }}"></div>
             <div [sqxMarkdown]="notification.message | sqxTranslate"></div>
         </div>
diff --git a/frontend/src/app/shared/components/search/query-list.component.html b/frontend/src/app/shared/components/search/query-list.component.html
index 84abb889a..d88e75219 100644
--- a/frontend/src/app/shared/components/search/query-list.component.html
+++ b/frontend/src/app/shared/components/search/query-list.component.html
@@ -2,8 +2,8 @@
     <ul class="nav nav-light flex-column">
         @for (saved of queries; track saved.name) {
             <li class="nav-item">
-                <button class="nav-link" [class.active]="isSelectedQuery(saved)" (click)="search.emit(saved.query)" type="button">
-                    <div class="row g-0">
+                <button class="nav-link w-full" [class.active]="isSelectedQuery(saved)" (click)="search.emit(saved.query)" type="button">
+                    <div class="row g-1 align-items-center">
                         <div class="col truncate">
                             <i class="icon-circle" [class.hidden]="!saved.color" [style.color]="saved.color"></i>
                             {{ saved.name | sqxTranslate }}
@@ -12,7 +12,7 @@
                         <div class="col-auto">
                             @if (canRemove) {
                                 <button
-                                    class="btn-sm btn-text-danger btn-remove"
+                                    class="btn btn-sm btn-text-danger btn-remove"
                                     attr.aria-label="{{ 'common.delete' | sqxTranslate }}"
                                     (click)="remove.emit(saved)"
                                     sqxStopClick
diff --git a/frontend/src/app/shared/components/search/query-list.component.scss b/frontend/src/app/shared/components/search/query-list.component.scss
index cc0cec5d1..8eb42e085 100644
--- a/frontend/src/app/shared/components/search/query-list.component.scss
+++ b/frontend/src/app/shared/components/search/query-list.component.scss
@@ -3,6 +3,8 @@
 
 .btn-remove {
     visibility: hidden;
+    margin-left: 0;
+    margin-right: -.5rem;
 
     i {
         margin: 0;
@@ -10,6 +12,18 @@
 }
 
 .nav-item {
+    .nav-link {
+        display: flex;
+        align-items: center;
+        width: 100%;
+        text-align: left;
+        text-decoration: none;
+    }
+
+    .row {
+        width: 100%;
+    }
+
     &:hover {
         .btn-remove {
             visibility: visible;
diff --git a/frontend/src/app/shared/components/search/search-form.component.html b/frontend/src/app/shared/components/search/search-form.component.html
index c07bca855..5b567aa0a 100644
--- a/frontend/src/app/shared/components/search/search-form.component.html
+++ b/frontend/src/app/shared/components/search/search-form.component.html
@@ -79,11 +79,6 @@
                 <sqx-form-row check for="user" label="search.saveQueryMyself" vertical>
                     <input class="form-check-input" id="user" formControlName="user" type="checkbox" />
                 </sqx-form-row>
-
-                <div class="form-check">
-                    <input class="form-check-input" id="user" formControlName="user" type="checkbox" />
-                    <label class="form-check-label" for="user"> {{ "search.saveQueryMyself" | sqxTranslate }}</label>
-                </div>
             </ng-container>
             <ng-container footer>
                 <button class="btn btn-text-secondary" (click)="saveQueryDialog.hide()" type="button">
diff --git a/frontend/src/app/shared/components/search/search-form.component.ts b/frontend/src/app/shared/components/search/search-form.component.ts
index 4092d1ea0..0f28e292e 100644
--- a/frontend/src/app/shared/components/search/search-form.component.ts
+++ b/frontend/src/app/shared/components/search/search-form.component.ts
@@ -216,6 +216,7 @@ export class SearchFormComponent {
     }
 
     public saveQueryComplete() {
+        debugger;
         const value = this.saveQueryForm.submit();
         if (!value) {
             return;