diff --git a/src/noggit/ui/object_palette.cpp b/src/noggit/ui/object_palette.cpp
index c9c66b67..ae532432 100755
--- a/src/noggit/ui/object_palette.cpp
+++ b/src/noggit/ui/object_palette.cpp
@@ -38,6 +38,7 @@ namespace Noggit
       setSelectionMode(QAbstractItemView::SingleSelection);
       setAcceptDrops(false);
       setMovement(Movement::Static);
+      setResizeMode(QListView::Adjust);
     }
 
     void ObjectList::mousePressEvent(QMouseEvent* event)
@@ -109,11 +110,13 @@ namespace Noggit
       QVBoxLayout* button_layout = new QVBoxLayout(this);
 
       _add_button = new QPushButton(this);
+      _add_button->setToolTip("Add from Asset Browser");
       _add_button->setIcon(FontAwesomeIcon(FontAwesome::plus));
       button_layout->addWidget(_add_button);
       connect(_add_button, &QAbstractButton::clicked, this, &ObjectPalette::addObjectFromAssetBrowser);
 
       _remove_button = new QPushButton(this);
+      _remove_button->setToolTip("Remove selected Object");
       _remove_button->setIcon(FontAwesomeIcon(FontAwesome::times));
       button_layout->addWidget(_remove_button);
       connect(_remove_button, &QAbstractButton::clicked, this, &ObjectPalette::removeSelectedTexture);
diff --git a/src/noggit/ui/object_palette.hpp b/src/noggit/ui/object_palette.hpp
index 481741f6..a2e0c23f 100755
--- a/src/noggit/ui/object_palette.hpp
+++ b/src/noggit/ui/object_palette.hpp
@@ -70,7 +70,7 @@ namespace Noggit
 
             QGridLayout* layout;
 
-            QListWidget* _object_list;
+            ObjectList* _object_list;
             QPushButton* _add_button;
             QPushButton* _remove_button;
             std::unordered_set<std::string> _object_paths;
diff --git a/src/noggit/ui/texture_palette_small.cpp b/src/noggit/ui/texture_palette_small.cpp
index 729ed4ab..3bef69f3 100755
--- a/src/noggit/ui/texture_palette_small.cpp
+++ b/src/noggit/ui/texture_palette_small.cpp
@@ -37,6 +37,7 @@ namespace Noggit
       setSelectionMode(QAbstractItemView::SingleSelection);
       setAcceptDrops(false);
       setMovement(Movement::Static);
+      setResizeMode(QListView::Adjust);
     }
 
     void PaletteList::mousePressEvent(QMouseEvent* event)
@@ -102,6 +103,7 @@ namespace Noggit
       QVBoxLayout* button_layout = new QVBoxLayout(this);
 
       _add_button = new QPushButton(this);
+      _add_button->setToolTip("Add Selected Texture");
       _add_button->setIcon(FontAwesomeIcon(FontAwesome::plus));
       button_layout->addWidget(_add_button);
       connect(_add_button, &QAbstractButton::clicked, this, &texture_palette_small::addTexture);
diff --git a/src/noggit/ui/texture_palette_small.hpp b/src/noggit/ui/texture_palette_small.hpp
index 645a7d96..d31feae5 100755
--- a/src/noggit/ui/texture_palette_small.hpp
+++ b/src/noggit/ui/texture_palette_small.hpp
@@ -66,7 +66,7 @@ namespace Noggit
 
       QGridLayout* layout;
 
-      QListWidget* _texture_list;
+      PaletteList* _texture_list;
       QPushButton* _add_button;
       QPushButton* _remove_button;
       std::unordered_set<std::string> _texture_paths;