diff --git a/data/locale/en-US.ini b/data/locale/en-US.ini
index 9cb9e544..f8ee14d4 100644
--- a/data/locale/en-US.ini
+++ b/data/locale/en-US.ini
@@ -128,6 +128,31 @@ AdvSceneSwitcher.macroTab.currentDockStatusText.false="Conditions false text:"
AdvSceneSwitcher.macroTab.currentDockHighlightIfExecuted="Highlight dock if macro actions were recently executed"
AdvSceneSwitcher.macroTab.toggleElseActions.hide.tooltip="Hide else actions"
AdvSceneSwitcher.macroTab.toggleElseActions.show.tooltip="Show else actions"
+AdvSceneSwitcher.macroTab.tooltip.macroAddButton="Add new macro"
+AdvSceneSwitcher.macroTab.tooltip.macroRemoveButton="Remove selected macros"
+AdvSceneSwitcher.macroTab.tooltip.macroUpButton="Move selected macro up"
+AdvSceneSwitcher.macroTab.tooltip.macroDownButton="Move selected macro down"
+AdvSceneSwitcher.macroTab.tooltip.macroName="Macro name"
+AdvSceneSwitcher.macroTab.tooltip.conditionAddButton="Add new condition"
+AdvSceneSwitcher.macroTab.tooltip.conditionRemoveButton="Remove selected condition"
+AdvSceneSwitcher.macroTab.tooltip.conditionTopButton="Move selected condition to the top"
+AdvSceneSwitcher.macroTab.tooltip.conditionUpButton="Move selected condition up"
+AdvSceneSwitcher.macroTab.tooltip.conditionDownButton="Move selected condition down"
+AdvSceneSwitcher.macroTab.tooltip.conditionBottomButton="Move selected condition to the bottom"
+AdvSceneSwitcher.macroTab.tooltip.actionAddButton="Add new action"
+AdvSceneSwitcher.macroTab.tooltip.actionRemoveButton="Remove selected action"
+AdvSceneSwitcher.macroTab.tooltip.actionTopButton="Move selected action to the top"
+AdvSceneSwitcher.macroTab.tooltip.actionUpButton="Move selected action up"
+AdvSceneSwitcher.macroTab.tooltip.actionDownButton="Move selected action down"
+AdvSceneSwitcher.macroTab.tooltip.actionBottomButton="Move selected action to the bottom"
+AdvSceneSwitcher.macroTab.tooltip.toggleShowElseSection="Toggle visibility of the else action section"
+AdvSceneSwitcher.macroTab.tooltip.elseActionAddButton="Add new action in the else section"
+AdvSceneSwitcher.macroTab.tooltip.elseActionRemoveButton="Remove selected action in the else section"
+AdvSceneSwitcher.macroTab.tooltip.elseActionTopButton="Move selected action to the top in the else section"
+AdvSceneSwitcher.macroTab.tooltip.elseActionUpButton="Move selected action up in the else section"
+AdvSceneSwitcher.macroTab.tooltip.elseActionDownButton="Move selected action down in the else section"
+AdvSceneSwitcher.macroTab.tooltip.elseActionBottomButton="Move selected action to the bottom in the else section"
+AdvSceneSwitcher.macroTab.tooltip.openMacroPropertiesButton="Open macro properties"
AdvSceneSwitcher.macroDock.pause="Pause"
AdvSceneSwitcher.macroDock.unpause="Unpause"
diff --git a/forms/advanced-scene-switcher.ui b/forms/advanced-scene-switcher.ui
index 14201771..4445b496 100644
--- a/forms/advanced-scene-switcher.ui
+++ b/forms/advanced-scene-switcher.ui
@@ -713,6 +713,9 @@
16777215
+
+ AdvSceneSwitcher.macroTab.tooltip.macroAddButton
+
true
@@ -729,6 +732,9 @@
16777215
+
+ AdvSceneSwitcher.macroTab.tooltip.macroRemoveButton
+
true
@@ -784,6 +790,9 @@
16777215
+
+ AdvSceneSwitcher.macroTab.tooltip.macroUpButton
+
true
@@ -800,6 +809,9 @@
16777215
+
+ AdvSceneSwitcher.macroTab.tooltip.macroDownButton
+
true
@@ -840,7 +852,11 @@
-
-
+
+
+ AdvSceneSwitcher.macroTab.tooltip.macroName
+
+
-
@@ -858,6 +874,9 @@
-
+
+ AdvSceneSwitcher.macroTab.runInParallel
+
AdvSceneSwitcher.macroTab.runInParallel
@@ -875,6 +894,9 @@
-
+
+ AdvSceneSwitcher.macroTab.onChange
+
AdvSceneSwitcher.macroTab.onChange
@@ -904,6 +926,9 @@
16777215
+
+ AdvSceneSwitcher.macroTab.tooltip.openMacroPropertiesButton
+
@@ -959,6 +984,9 @@
16777215
+
+ AdvSceneSwitcher.macroTab.tooltip.conditionAddButton
+
true
@@ -975,6 +1003,9 @@
16777215
+
+ AdvSceneSwitcher.macroTab.tooltip.conditionRemoveButton
+
true
@@ -1030,6 +1061,9 @@
16777215
+
+ AdvSceneSwitcher.macroTab.tooltip.conditionTopButton
+
true
@@ -1043,6 +1077,9 @@
16777215
+
+ AdvSceneSwitcher.macroTab.tooltip.conditionUpButton
+
@@ -1062,6 +1099,9 @@
16777215
+
+ AdvSceneSwitcher.macroTab.tooltip.conditionDownButton
+
true
@@ -1078,6 +1118,9 @@
16777215
+
+ AdvSceneSwitcher.macroTab.tooltip.conditionBottomButton
+
true
@@ -1141,6 +1184,9 @@
16777215
+
+ AdvSceneSwitcher.macroTab.tooltip.actionAddButton
+
true
@@ -1157,6 +1203,9 @@
16777215
+
+ AdvSceneSwitcher.macroTab.tooltip.actionRemoveButton
+
true
@@ -1212,6 +1261,9 @@
16777215
+
+ AdvSceneSwitcher.macroTab.tooltip.actionTopButton
+
true
@@ -1225,6 +1277,9 @@
16777215
+
+ AdvSceneSwitcher.macroTab.tooltip.actionUpButton
+
true
@@ -1241,6 +1296,9 @@
16777215
+
+ AdvSceneSwitcher.macroTab.tooltip.actionDownButton
+
true
@@ -1257,6 +1315,9 @@
16777215
+
+ AdvSceneSwitcher.macroTab.tooltip.actionBottomButton
+
true
@@ -1283,6 +1344,9 @@
16777215
+
+ AdvSceneSwitcher.macroTab.tooltip.toggleShowElseSection
+
true
@@ -1332,6 +1396,9 @@
16777215
+
+ AdvSceneSwitcher.macroTab.tooltip.elseActionAddButton
+
true
@@ -1348,6 +1415,9 @@
16777215
+
+ AdvSceneSwitcher.macroTab.tooltip.elseActionRemoveButton
+
true
@@ -1403,6 +1473,9 @@
16777215
+
+ AdvSceneSwitcher.macroTab.tooltip.elseActionTopButton
+
true
@@ -1416,6 +1489,9 @@
16777215
+
+ AdvSceneSwitcher.macroTab.tooltip.elseActionUpButton
+
true
@@ -1432,6 +1508,9 @@
16777215
+
+ AdvSceneSwitcher.macroTab.tooltip.elseActionDownButton
+
true
@@ -1448,6 +1527,9 @@
16777215
+
+ AdvSceneSwitcher.macroTab.tooltip.elseActionBottomButton
+
true