diff --git a/src/mainwindow.ui b/src/mainwindow.ui
index afe500533..0119fc765 100644
--- a/src/mainwindow.ui
+++ b/src/mainwindow.ui
@@ -363,7 +363,7 @@ QSplitter:handle{
       </property>
       <widget class="QFrame" name="statusPanel">
        <property name="sizePolicy">
-        <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
+        <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
@@ -1023,7 +1023,7 @@ QSplitter:handle{
               <widget class="QLineEdit" name="searchContactText">
                <property name="sizePolicy">
                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
-                 <horstretch>1</horstretch>
+                 <horstretch>0</horstretch>
                  <verstretch>0</verstretch>
                 </sizepolicy>
                </property>
@@ -1032,7 +1032,7 @@ QSplitter:handle{
              <item>
               <widget class="QComboBox" name="searchContactFilterCBox">
                <property name="sizePolicy">
-                <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+                <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
                  <horstretch>0</horstretch>
                  <verstretch>0</verstretch>
                 </sizepolicy>
@@ -1047,7 +1047,7 @@ QSplitter:handle{
         <item>
          <widget class="AdjustingScrollArea" name="friendList">
           <property name="sizePolicy">
-           <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
+           <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
             <horstretch>0</horstretch>
             <verstretch>0</verstretch>
            </sizepolicy>
@@ -1072,8 +1072,8 @@ QSplitter:handle{
             <rect>
              <x>0</x>
              <y>0</y>
-             <width>284</width>
-             <height>348</height>
+             <width>292</width>
+             <height>359</height>
             </rect>
            </property>
            <layout class="QVBoxLayout" name="verticalLayout_5"/>
@@ -1838,7 +1838,7 @@ QSplitter:handle{
      <x>0</x>
      <y>0</y>
      <width>775</width>
-     <height>25</height>
+     <height>19</height>
     </rect>
    </property>
   </widget>
diff --git a/src/widget/friendlistwidget.cpp b/src/widget/friendlistwidget.cpp
index 6f4d5fed9..c997b6b4f 100644
--- a/src/widget/friendlistwidget.cpp
+++ b/src/widget/friendlistwidget.cpp
@@ -65,7 +65,6 @@ QVBoxLayout* FriendListWidget::getFriendLayout(Status s)
     if (res != layouts.end())
         return res.value();
 
-    //qDebug() << "Friend Status: " << static_cast<int>(s) << " not found!";
     return layouts[static_cast<int>(Status::Online)];
 }
 
diff --git a/ui/window/statusPanel.css b/ui/window/statusPanel.css
index 158eae70e..92aa0be85 100644
--- a/ui/window/statusPanel.css
+++ b/ui/window/statusPanel.css
@@ -4,7 +4,39 @@ QLineEdit
     background-color: @themeMedium;
     color: white;
     border: 0px;
-    border-radius: 6px;
+    border-radius: 4px;
+}
+
+QComboBox {
+    background: none;
+    background-color: @themeMedium;
+    color: white;
+    border-style: none;
+    border-radius: 4px;
+}
+
+QComboBox:on {
+    background-color: @themeDark;
+    border-radius: 4px;
+}
+
+QComboBox:drop-down {
+    border-style: none;
+    border-radius: 4px;
+}
+
+/**
+  Uncomment this after https://github.com/tux3/qTox/pull/1640
+  is merged!
+QComboBox:down-arrow {
+    image: url(ui/css/down_arrow.png);
+}
+**/
+
+QListView {
+    background-color: @themeLight;
+    border-style: none;
+    border-radius: 4px;
 }
 
 #statusPanel