diff --git a/src/main/python/plotlyst/view/widget/template/impl.py b/src/main/python/plotlyst/view/widget/template/impl.py
index f43f0ab2e..79b1f85c1 100644
--- a/src/main/python/plotlyst/view/widget/template/impl.py
+++ b/src/main/python/plotlyst/view/widget/template/impl.py
@@ -24,19 +24,18 @@
 from PyQt6.QtCore import Qt, pyqtSignal, QEvent, QModelIndex, QSize
 from PyQt6.QtGui import QMouseEvent, QIcon, QWheelEvent
 from PyQt6.QtWidgets import QHBoxLayout, QWidget, QLineEdit, QToolButton, QLabel, \
-    QSpinBox, QButtonGroup, QListView, QSlider
+    QSpinBox, QButtonGroup, QListView, QSlider, QFrame
 from overrides import overrides
 from qthandy import spacer, hbox, vbox, bold, line, underline, retain_when_hidden
 
 from plotlyst.core.template import TemplateField, SelectionItem
 from plotlyst.model.template import TemplateFieldSelectionModel, TraitsFieldItemsSelectionModel, \
     TraitsProxyModel
-from plotlyst.view.generated.trait_selection_widget_ui import Ui_TraitSelectionWidget
 from plotlyst.view.icons import IconRegistry
 from plotlyst.view.layout import group
 from plotlyst.view.widget.button import CollapseButton
 from plotlyst.view.widget.display import Subtitle, Icon
-from plotlyst.view.widget.input import AutoAdjustableTextEdit, Toggle
+from plotlyst.view.widget.input import AutoAdjustableTextEdit, Toggle, SearchField
 from plotlyst.view.widget.labels import TraitLabel, LabelsEditorWidget
 from plotlyst.view.widget.progress import CircularProgressBar
 from plotlyst.view.widget.template.base import TemplateDisplayWidget, TemplateFieldWidgetBase, \
@@ -93,10 +92,29 @@ def _addItems(self, items: Set[SelectionItem]):
             if not item.meta.get('positive', True):
                 self._wdgLabels.addLabel(TraitLabel(item.text, positive=False))
 
-    class Popup(QWidget, Ui_TraitSelectionWidget):
+    class Popup(QWidget):
         def __init__(self, parent=None):
             super().__init__(parent)
-            self.setupUi(self)
+            vbox(self, 0, 0)
+
+            self.wdgMain = QWidget()
+            self.wdgMain.setProperty('relaxed-white-bg', True)
+            vbox(self.wdgMain, 5, 10)
+            self.layout().addWidget(self.wdgMain)
+
+            self.lineFilter = SearchField()
+            self.lstPositiveTraitsView = QListView()
+            self.lstPositiveTraitsView.setFrameShape(QFrame.Shape.NoFrame)
+            self.lstNegativeTraitsView = QListView()
+            self.lstNegativeTraitsView.setFrameShape(QFrame.Shape.NoFrame)
+
+            self.wdgLists = QWidget()
+            hbox(self.wdgLists)
+            self.wdgLists.layout().addWidget(self.lstPositiveTraitsView)
+            self.wdgLists.layout().addWidget(self.lstNegativeTraitsView)
+            self.wdgMain.layout().addWidget(self.lineFilter, alignment=Qt.AlignmentFlag.AlignRight)
+            self.wdgMain.layout().addWidget(self.wdgLists)
+
             self.positiveProxy = TraitsProxyModel()
             self.negativeProxy = TraitsProxyModel(positive=False)
             self._model: Optional[TraitsFieldItemsSelectionModel] = None
@@ -110,13 +128,14 @@ def setModel(self, model: TraitsFieldItemsSelectionModel):
             self.positiveProxy.setSourceModel(model)
             self.positiveProxy.setFilterKeyColumn(TemplateFieldSelectionModel.ColName)
             self.lstPositiveTraitsView.setModel(self.positiveProxy)
-            self.filterPositive.textChanged.connect(self.positiveProxy.setFilterRegularExpression)
 
             self.negativeProxy.setFilterCaseSensitivity(Qt.CaseSensitivity.CaseInsensitive)
             self.negativeProxy.setSourceModel(model)
             self.negativeProxy.setFilterKeyColumn(TemplateFieldSelectionModel.ColName)
             self.lstNegativeTraitsView.setModel(self.negativeProxy)
-            self.filterNegative.textChanged.connect(self.negativeProxy.setFilterRegularExpression)
+
+            self.lineFilter.lineSearch.textChanged.connect(self.positiveProxy.setFilterRegularExpression)
+            self.lineFilter.lineSearch.textChanged.connect(self.negativeProxy.setFilterRegularExpression)
 
             for lst in [self.lstPositiveTraitsView, self.lstNegativeTraitsView]:
                 lst.setModelColumn(TemplateFieldSelectionModel.ColName)
diff --git a/ui/trait_selection_widget.ui b/ui/trait_selection_widget.ui
deleted file mode 100644
index bf978f50f..000000000
--- a/ui/trait_selection_widget.ui
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>TraitSelectionWidget</class>
- <widget class="QWidget" name="TraitSelectionWidget">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>652</width>
-    <height>424</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Form</string>
-  </property>
-  <layout class="QHBoxLayout" name="horizontalLayout">
-   <property name="spacing">
-    <number>3</number>
-   </property>
-   <property name="leftMargin">
-    <number>2</number>
-   </property>
-   <property name="topMargin">
-    <number>2</number>
-   </property>
-   <property name="rightMargin">
-    <number>2</number>
-   </property>
-   <property name="bottomMargin">
-    <number>2</number>
-   </property>
-   <item>
-    <layout class="QVBoxLayout" name="verticalLayout">
-     <property name="spacing">
-      <number>0</number>
-     </property>
-     <item>
-      <widget class="QLineEdit" name="filterPositive">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="minimumSize">
-        <size>
-         <width>150</width>
-         <height>0</height>
-        </size>
-       </property>
-       <property name="placeholderText">
-        <string>Filter positive traits</string>
-       </property>
-       <property name="clearButtonEnabled">
-        <bool>true</bool>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QListView" name="lstPositiveTraitsView">
-       <property name="cursor" stdset="0">
-        <cursorShape>PointingHandCursor</cursorShape>
-       </property>
-       <property name="focusPolicy">
-        <enum>Qt::ClickFocus</enum>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
-   <item>
-    <layout class="QVBoxLayout" name="verticalLayout_2">
-     <property name="spacing">
-      <number>0</number>
-     </property>
-     <item>
-      <widget class="QLineEdit" name="filterNegative">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="minimumSize">
-        <size>
-         <width>150</width>
-         <height>0</height>
-        </size>
-       </property>
-       <property name="placeholderText">
-        <string>Filter negative traits</string>
-       </property>
-       <property name="clearButtonEnabled">
-        <bool>true</bool>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QListView" name="lstNegativeTraitsView">
-       <property name="cursor" stdset="0">
-        <cursorShape>PointingHandCursor</cursorShape>
-       </property>
-       <property name="focusPolicy">
-        <enum>Qt::ClickFocus</enum>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
-  </layout>
- </widget>
- <tabstops>
-  <tabstop>lstPositiveTraitsView</tabstop>
-  <tabstop>filterPositive</tabstop>
-  <tabstop>filterNegative</tabstop>
-  <tabstop>lstNegativeTraitsView</tabstop>
- </tabstops>
- <resources/>
- <connections/>
-</ui>