diff --git a/applications/gui2/src/modules/addsource.cpp b/applications/gui2/src/modules/addsource.cpp
index 8b0aa3267f086282a0bec2337053cd58151abcf4..d90039c3e9bbab92cb4a0e1e6fa39626b928c1d6 100644
--- a/applications/gui2/src/modules/addsource.cpp
+++ b/applications/gui2/src/modules/addsource.cpp
@@ -4,6 +4,7 @@ using ftl::gui2::AddCtrl;
 
 void AddCtrl::init() {
 	button = screen->addButton(ENTYPO_ICON_PLUS);
+	button->setTooltip("Add New Source");
 	button->setCallback([this](){
 		button->setPushed(false);
 		show();
diff --git a/applications/gui2/src/modules/calibration/calibration.cpp b/applications/gui2/src/modules/calibration/calibration.cpp
index 910c3046753136881902822695d5578f9bbdab3d..2c87f99f4bcc84696c0d5e4b111547579764c1de 100644
--- a/applications/gui2/src/modules/calibration/calibration.cpp
+++ b/applications/gui2/src/modules/calibration/calibration.cpp
@@ -238,6 +238,7 @@ void Calibration::init() {
 
 	auto button = screen->addButton<ftl::gui2::PopupButton>("", ENTYPO_ICON_CAMERA);
 	button->setChevronIcon(0);
+	button->setTooltip("Calibrate Cameras");
 
 	auto* popup = button->popup();
 	popup->setLayout(new nanogui::BoxLayout
diff --git a/applications/gui2/src/modules/config.cpp b/applications/gui2/src/modules/config.cpp
index ab38d5f382964fba6201a688288dd416ca2a21b8..bfac6664e5a93f4b6579bf1d812e7cc856c91d4b 100644
--- a/applications/gui2/src/modules/config.cpp
+++ b/applications/gui2/src/modules/config.cpp
@@ -4,6 +4,7 @@ using ftl::gui2::ConfigCtrl;
 
 void ConfigCtrl::init() {
 	button = screen->addButton(ENTYPO_ICON_COG);
+	button->setTooltip("Settings");
 	button->setCallback([this](){
 		button->setPushed(false);
 		show();
diff --git a/applications/gui2/src/modules/statistics.cpp b/applications/gui2/src/modules/statistics.cpp
index 9b90167563cf962fa8d039cf8aaf68f5e322bff8..60fe0fedd663c1625d9b34bb1edcf7f3cad44aa2 100644
--- a/applications/gui2/src/modules/statistics.cpp
+++ b/applications/gui2/src/modules/statistics.cpp
@@ -41,6 +41,7 @@ void Statistics::init() {
 	widget = new ftl::gui2::StatisticsWidget(screen, this);
 	widget->setVisible(value("visible", false));
 	auto button = screen->addButton(ENTYPO_ICON_INFO);
+	button->setTooltip("Show Information");
 	button->setCallback([this, button](){
 		button->setPushed(false);
 		widget->setVisible(!widget->visible());
diff --git a/applications/gui2/src/modules/thumbnails.cpp b/applications/gui2/src/modules/thumbnails.cpp
index 14f582233c901269729be23e7923cbbd38cf6b15..f23dd97ee99abb01d5e0004befc5d21a40b28374 100644
--- a/applications/gui2/src/modules/thumbnails.cpp
+++ b/applications/gui2/src/modules/thumbnails.cpp
@@ -12,6 +12,7 @@ using ftl::gui2::ThumbnailsController;
 
 void ThumbnailsController::init() {
 	auto button = screen->addButton(ENTYPO_ICON_HOME);
+	button->setTooltip("Home");
 	button->setCallback([this, button](){
 		button->setPushed(false);
 		activate();
diff --git a/applications/gui2/src/views/config.cpp b/applications/gui2/src/views/config.cpp
index 896f773ccb4ea309ae67d4322aa3253d79eee7c4..029b66d65a4fb0ddfa2fc08d2872aa7fb4bf1155 100644
--- a/applications/gui2/src/views/config.cpp
+++ b/applications/gui2/src/views/config.cpp
@@ -41,6 +41,7 @@ private:
 				}
 			}
 			previous = str;
+			screen()->performLayout();
 		}
 	}