diff --git a/Terminology_Termentry.framework b/Terminology_Termentry.framework
index ba1b46e..6ecfbbb 100644
--- a/Terminology_Termentry.framework
+++ b/Terminology_Termentry.framework
@@ -347,7 +347,7 @@
 													<String>${i18n(term.move.element.up_description)}</String>
 												</field>
 												<field name="largeIconPath">
-													<String>${framework}/frameworks/termentry/icons/up_20.png</String>
+													<String>${framework}/frameworks/termentry/icons/up_24.png</String>
 												</field>
 												<field name="smallIconPath">
 													<String>${framework}/frameworks/termentry/icons/up_16.png</String>
@@ -417,7 +417,7 @@
 													<String>${i18n(term.move.element.down_description)}</String>
 												</field>
 												<field name="largeIconPath">
-													<String>${framework}/frameworks/termentry/icons/down_20.png</String>
+													<String>${framework}/frameworks/termentry/icons/down_24.png</String>
 												</field>
 												<field name="smallIconPath">
 													<String>${framework}/frameworks/termentry/icons/down_16.png</String>
@@ -487,10 +487,10 @@
 													<String>${i18n(term.element.delete_description)}</String>
 												</field>
 												<field name="largeIconPath">
-													<String>${framework}/framework/icons/delete_20.png</String>
+													<String>${framework}/frameworks/termentry/icons/delete-24.png</String>
 												</field>
 												<field name="smallIconPath">
-													<String>${framework}/framework/icons/delete_16.png</String>
+													<String>${framework}/frameworks/termentry/icons/delete-16.png</String>
 												</field>
 												<field name="accessKey">
 													<String></String>
@@ -549,10 +549,10 @@
 													<String>${i18n(term.termVariant.add_description)}</String>
 												</field>
 												<field name="largeIconPath">
-													<String>${framework}/framework/icons/add_20.png</String>
+													<String>${framework}/frameworks/termentry/icons/add-24.png</String>
 												</field>
 												<field name="smallIconPath">
-													<String>${framework}/framework/icons/add_16.png</String>
+													<String>${framework}/frameworks/termentry/icons/add-16.png</String>
 												</field>
 												<field name="accessKey">
 													<String></String>
@@ -619,10 +619,10 @@
 													<String>${i18n(term.fullForm.add_description)}</String>
 												</field>
 												<field name="largeIconPath">
-													<String>${framework}/framework/icons/add_20.png</String>
+													<String>${framework}/frameworks/termentry/icons/add-24.png</String>
 												</field>
 												<field name="smallIconPath">
-													<String>${framework}/framework/icons/add_16.png</String>
+													<String>${framework}/frameworks/termentry/icons/add-16.png</String>
 												</field>
 												<field name="accessKey">
 													<String></String>
@@ -769,10 +769,10 @@
 													<String>${i18n(term.abbreviation.add_description)}</String>
 												</field>
 												<field name="largeIconPath">
-													<String>${framework}/frameworks/termentry/icons/add_24.png</String>
+													<String>${framework}/frameworks/termentry/icons/add-24.png</String>
 												</field>
 												<field name="smallIconPath">
-													<String>${framework}/frameworks/termentry/icons/add_16.png</String>
+													<String>${framework}/frameworks/termentry/icons/add-16.png</String>
 												</field>
 												<field name="accessKey">
 													<String></String>
@@ -919,10 +919,10 @@
 													<String>${i18n(term.acronym.add_description)}</String>
 												</field>
 												<field name="largeIconPath">
-													<String>${framework}/frameworks/termentry/icons/add_24.png</String>
+													<String>${framework}/frameworks/termentry/icons/add-24.png</String>
 												</field>
 												<field name="smallIconPath">
-													<String>${framework}/frameworks/termentry/icons/add_16.png</String>
+													<String>${framework}/frameworks/termentry/icons/add-16.png</String>
 												</field>
 												<field name="accessKey">
 													<String></String>
@@ -1069,10 +1069,10 @@
 													<String>${i18n(term.verb.add_description)}</String>
 												</field>
 												<field name="largeIconPath">
-													<String>${framework}/framework/icons/add_20.png</String>
+													<String>${framework}/frameworks/termentry/icons/add-24.png</String>
 												</field>
 												<field name="smallIconPath">
-													<String>${framework}/framework/icons/add_16.png</String>
+													<String>${framework}/frameworks/termentry/icons/add-16.png</String>
 												</field>
 												<field name="accessKey">
 													<String></String>
@@ -1219,10 +1219,10 @@
 													<String>${i18n(term.fullForm.delete_description)}</String>
 												</field>
 												<field name="largeIconPath">
-													<String>${framework}/framework/icons/delete_20.png</String>
+													<String>${framework}/frameworks/termentry/icons/delete-24.png</String>
 												</field>
 												<field name="smallIconPath">
-													<String>${framework}/framework/icons/delete_16.png</String>
+													<String>${framework}/frameworks/termentry/icons/delete-16.png</String>
 												</field>
 												<field name="accessKey">
 													<String></String>
@@ -1281,10 +1281,10 @@
 													<String>${i18n(term.abbreviation.delete_description)}</String>
 												</field>
 												<field name="largeIconPath">
-													<String>${framework}/frameworks/termentry/icons/delete_24.png</String>
+													<String>${framework}/frameworks/termentry/icons/delete-24.png</String>
 												</field>
 												<field name="smallIconPath">
-													<String>${framework}/frameworks/termentry/icons/delete_16.png</String>
+													<String>${framework}/frameworks/termentry/icons/delete-16.png</String>
 												</field>
 												<field name="accessKey">
 													<String></String>
@@ -1343,10 +1343,10 @@
 													<String>${i18n(term.relatedTerm.delete_description)}</String>
 												</field>
 												<field name="largeIconPath">
-													<String>${framework}/framework/icons/delete_20.png</String>
+													<String>${framework}/frameworks/termentry/icons/delete-24.png</String>
 												</field>
 												<field name="smallIconPath">
-													<String>${framework}/framework/icons/delete_16.png</String>
+													<String>${framework}/frameworks/termentry/icons/delete-16.png</String>
 												</field>
 												<field name="accessKey">
 													<String></String>
@@ -1405,10 +1405,10 @@
 													<String>${i18n(term.verb.delete_description)}</String>
 												</field>
 												<field name="largeIconPath">
-													<String>${framework}/framework/icons/delete_20.png</String>
+													<String>${framework}/frameworks/termentry/icons/delete-24.png</String>
 												</field>
 												<field name="smallIconPath">
-													<String>${framework}/framework/icons/delete_16.png</String>
+													<String>${framework}/frameworks/termentry/icons/delete-16.png</String>
 												</field>
 												<field name="accessKey">
 													<String></String>
@@ -1467,10 +1467,10 @@
 													<String>${i18n(term.attribute.number.add_description)}</String>
 												</field>
 												<field name="largeIconPath">
-													<String>${framework}/framework/icons/add_20.png</String>
+													<String>${framework}/frameworks/termentry/icons/add-24.png</String>
 												</field>
 												<field name="smallIconPath">
-													<String>${framework}/framework/icons/add_16.png</String>
+													<String>${framework}/frameworks/termentry/icons/add-16.png</String>
 												</field>
 												<field name="accessKey">
 													<String></String>
@@ -1541,10 +1541,10 @@
 													<String>${i18n(term.attribute.case.add_description)}</String>
 												</field>
 												<field name="largeIconPath">
-													<String>${framework}/framework/icons/add_20.png</String>
+													<String>${framework}/frameworks/termentry/icons/add-24.png</String>
 												</field>
 												<field name="smallIconPath">
-													<String>${framework}/framework/icons/add_16.png</String>
+													<String>${framework}/frameworks/termentry/icons/add-16.png</String>
 												</field>
 												<field name="accessKey">
 													<String></String>
@@ -1615,10 +1615,10 @@
 													<String>${i18n(term.termVariant.delete_description)}</String>
 												</field>
 												<field name="largeIconPath">
-													<String>${framework}/framework/icons/delete_20.png</String>
+													<String>${framework}/frameworks/termentry/icons/delete-24.png</String>
 												</field>
 												<field name="smallIconPath">
-													<String>${framework}/framework/icons/delete_16.png</String>
+													<String>${framework}/frameworks/termentry/icons/delete-16.png</String>
 												</field>
 												<field name="accessKey">
 													<String></String>
@@ -1677,10 +1677,10 @@
 													<String>${i18n(term.annotation.add_description)}</String>
 												</field>
 												<field name="largeIconPath">
-													<String>${framework}/framework/icons/add_20.png</String>
+													<String>${framework}/frameworks/termentry/icons/add-24.png</String>
 												</field>
 												<field name="smallIconPath">
-													<String>${framework}/framework/icons/add_16.png</String>
+													<String>${framework}/frameworks/termentry/icons/add-16.png</String>
 												</field>
 												<field name="accessKey">
 													<String></String>
@@ -1771,10 +1771,10 @@
 													<String>${i18n(term.termContext.add_description)}</String>
 												</field>
 												<field name="largeIconPath">
-													<String>${framework}/framework/icons/add_20.png</String>
+													<String>${framework}/frameworks/termentry/icons/add-24.png</String>
 												</field>
 												<field name="smallIconPath">
-													<String>${framework}/framework/icons/add_16.png</String>
+													<String>${framework}/frameworks/termentry/icons/add-16.png</String>
 												</field>
 												<field name="accessKey">
 													<String></String>
@@ -1844,10 +1844,10 @@
 													<String>${i18n(term.termSource.add_description)}</String>
 												</field>
 												<field name="largeIconPath">
-													<String>${framework}/framework/icons/add_20.png</String>
+													<String>${framework}/frameworks/termentry/icons/add-24.png</String>
 												</field>
 												<field name="smallIconPath">
-													<String>${framework}/framework/icons/add_16.png</String>
+													<String>${framework}/frameworks/termentry/icons/add-16.png</String>
 												</field>
 												<field name="accessKey">
 													<String></String>
@@ -1916,10 +1916,10 @@
 													<String>${i18n(term.antonyms.add_description)}</String>
 												</field>
 												<field name="largeIconPath">
-													<String>${framework}/framework/icons/add_20.png</String>
+													<String>${framework}/frameworks/termentry/icons/add-24.png</String>
 												</field>
 												<field name="smallIconPath">
-													<String>${framework}/framework/icons/add_16.png</String>
+													<String>${framework}/frameworks/termentry/icons/add-16.png</String>
 												</field>
 												<field name="accessKey">
 													<String></String>
@@ -2038,10 +2038,10 @@
 													<String>${i18n(term.partsOf.add_description)}</String>
 												</field>
 												<field name="largeIconPath">
-													<String>${framework}/framework/icons/add_20.png</String>
+													<String>${framework}/frameworks/termentry/icons/add-24.png</String>
 												</field>
 												<field name="smallIconPath">
-													<String>${framework}/framework/icons/add_16.png</String>
+													<String>${framework}/frameworks/termentry/icons/add-16.png</String>
 												</field>
 												<field name="accessKey">
 													<String></String>
@@ -2158,10 +2158,10 @@
 													<String>${i18n(term.superordinateConcepts.add_description)}</String>
 												</field>
 												<field name="largeIconPath">
-													<String>${framework}/framework/icons/add_20.png</String>
+													<String>${framework}/frameworks/termentry/icons/add-24.png</String>
 												</field>
 												<field name="smallIconPath">
-													<String>${framework}/framework/icons/add_16.png</String>
+													<String>${framework}/frameworks/termentry/icons/add-16.png</String>
 												</field>
 												<field name="accessKey">
 													<String></String>
@@ -2278,10 +2278,10 @@
 													<String>${i18n(term.subordinateConcepts.add_description)}</String>
 												</field>
 												<field name="largeIconPath">
-													<String>${framework}/framework/icons/add_20.png</String>
+													<String>${framework}/frameworks/termentry/icons/add-24.png</String>
 												</field>
 												<field name="smallIconPath">
-													<String>${framework}/framework/icons/add_16.png</String>
+													<String>${framework}/frameworks/termentry/icons/add-16.png</String>
 												</field>
 												<field name="accessKey">
 													<String></String>
@@ -2398,10 +2398,10 @@
 													<String>${i18n(term.relatedTerms.add_description)}</String>
 												</field>
 												<field name="largeIconPath">
-													<String>${framework}/framework/icons/add_20.png</String>
+													<String>${framework}/frameworks/termentry/icons/add-24.png</String>
 												</field>
 												<field name="smallIconPath">
-													<String>${framework}/framework/icons/add_16.png</String>
+													<String>${framework}/frameworks/termentry/icons/add-16.png</String>
 												</field>
 												<field name="accessKey">
 													<String></String>
@@ -2518,10 +2518,10 @@
 													<String>${i18n(term.definition.add_description)}</String>
 												</field>
 												<field name="largeIconPath">
-													<String>${framework}/frameworks/termentry/icons/add_24.png</String>
+													<String>${framework}/frameworks/termentry/icons/add-24.png</String>
 												</field>
 												<field name="smallIconPath">
-													<String>${framework}/frameworks/termentry/icons/add_16.png</String>
+													<String>${framework}/frameworks/termentry/icons/add-16.png</String>
 												</field>
 												<field name="accessKey">
 													<String></String>
@@ -2594,10 +2594,10 @@
 													<String>${i18n(term.definition.delete_description)}</String>
 												</field>
 												<field name="largeIconPath">
-													<String>${framework}/framework/icons/delete_20.png</String>
+													<String>${framework}/frameworks/termentry/icons/delete-24.png</String>
 												</field>
 												<field name="smallIconPath">
-													<String>${framework}/framework/icons/delete_16.png</String>
+													<String>${framework}/frameworks/termentry/icons/delete-16.png</String>
 												</field>
 												<field name="accessKey">
 													<String></String>
@@ -2656,10 +2656,10 @@
 													<String>${i18n(term.equation-figure.add_description)}</String>
 												</field>
 												<field name="largeIconPath">
-													<String>${framework}/framework/icons/add_20.png</String>
+													<String>${framework}/frameworks/termentry/icons/add-24.png</String>
 												</field>
 												<field name="smallIconPath">
-													<String>${framework}/framework/icons/add_16.png</String>
+													<String>${framework}/frameworks/termentry/icons/add-16.png</String>
 												</field>
 												<field name="accessKey">
 													<String></String>
@@ -2746,10 +2746,10 @@
 													<String>${i18n(term.note.add_description)}</String>
 												</field>
 												<field name="largeIconPath">
-													<String>${framework}/framework/icons/add_20.png</String>
+													<String>${framework}/frameworks/termentry/icons/add-24.png</String>
 												</field>
 												<field name="smallIconPath">
-													<String>${framework}/framework/icons/add_16.png</String>
+													<String>${framework}/frameworks/termentry/icons/add-16.png</String>
 												</field>
 												<field name="accessKey">
 													<String></String>
@@ -2816,10 +2816,10 @@
 													<String>${i18n(term.partOfSpeech.add_description)}</String>
 												</field>
 												<field name="largeIconPath">
-													<String>${framework}/framework/icons/add_20.png</String>
+													<String>${framework}/frameworks/termentry/icons/add-24.png</String>
 												</field>
 												<field name="smallIconPath">
-													<String>${framework}/framework/icons/add_16.png</String>
+													<String>${framework}/frameworks/termentry/icons/add-16.png</String>
 												</field>
 												<field name="accessKey">
 													<String></String>
@@ -2886,10 +2886,10 @@
 													<String>${i18n(term.fig.add_description)}</String>
 												</field>
 												<field name="largeIconPath">
-													<String>${framework}/framework/icons/add_20.png</String>
+													<String>${framework}/frameworks/termentry/icons/add-24.png</String>
 												</field>
 												<field name="smallIconPath">
-													<String>${framework}/framework/icons/add_16.png</String>
+													<String>${framework}/frameworks/termentry/icons/add-16.png</String>
 												</field>
 												<field name="accessKey">
 													<String></String>
@@ -2959,10 +2959,10 @@
 													<String>${i18n(term.concept-domains.add_description)}</String>
 												</field>
 												<field name="largeIconPath">
-													<String>${framework}/framework/icons/add_20.png</String>
+													<String>${framework}/frameworks/termentry/icons/add-24.png</String>
 												</field>
 												<field name="smallIconPath">
-													<String>${framework}/framework/icons/add_16.png</String>
+													<String>${framework}/frameworks/termentry/icons/add-16.png</String>
 												</field>
 												<field name="accessKey">
 													<String></String>
@@ -3031,10 +3031,10 @@
 													<String>${i18n(term.definitionSource.add_description)}</String>
 												</field>
 												<field name="largeIconPath">
-													<String>${framework}/framework/icons/add_20.png</String>
+													<String>${framework}/frameworks/termentry/icons/add-24.png</String>
 												</field>
 												<field name="smallIconPath">
-													<String>${framework}/framework/icons/add_16.png</String>
+													<String>${framework}/frameworks/termentry/icons/add-16.png</String>
 												</field>
 												<field name="accessKey">
 													<String></String>
@@ -3104,10 +3104,10 @@
 													<String>${i18n(term.sourceName.add_description)}</String>
 												</field>
 												<field name="largeIconPath">
-													<String>${framework}/framework/icons/add_20.png</String>
+													<String>${framework}/frameworks/termentry/icons/add-24.png</String>
 												</field>
 												<field name="smallIconPath">
-													<String>${framework}/framework/icons/add_16.png</String>
+													<String>${framework}/frameworks/termentry/icons/add-16.png</String>
 												</field>
 												<field name="accessKey">
 													<String></String>
@@ -3174,10 +3174,10 @@
 													<String>${i18n(term.sourceReference.add_description)}</String>
 												</field>
 												<field name="largeIconPath">
-													<String>${framework}/framework/icons/add_20.png</String>
+													<String>${framework}/frameworks/termentry/icons/add-24.png</String>
 												</field>
 												<field name="smallIconPath">
-													<String>${framework}/framework/icons/add_16.png</String>
+													<String>${framework}/frameworks/termentry/icons/add-16.png</String>
 												</field>
 												<field name="accessKey">
 													<String></String>
@@ -3268,10 +3268,10 @@
 													<String>${i18n(term.sourceName.delete_description)}</String>
 												</field>
 												<field name="largeIconPath">
-													<String>${framework}/framework/icons/delete_20.png</String>
+													<String>${framework}/frameworks/termentry/icons/delete-24.png</String>
 												</field>
 												<field name="smallIconPath">
-													<String>${framework}/framework/icons/delete_16.png</String>
+													<String>${framework}/frameworks/termentry/icons/delete-16.png</String>
 												</field>
 												<field name="accessKey">
 													<String></String>
@@ -3362,10 +3362,10 @@
 													<String>${i18n(term.sourceReference.delete_description)}</String>
 												</field>
 												<field name="largeIconPath">
-													<String>${framework}/framework/icons/delete_20.png</String>
+													<String>${framework}/frameworks/termentry/icons/delete-24.png</String>
 												</field>
 												<field name="smallIconPath">
-													<String>${framework}/framework/icons/delete_16.png</String>
+													<String>${framework}/frameworks/termentry/icons/delete-16.png</String>
 												</field>
 												<field name="accessKey">
 													<String></String>
@@ -3456,10 +3456,10 @@
 													<String>${i18n(term.agreedWith.add_description)}</String>
 												</field>
 												<field name="largeIconPath">
-													<String>${framework}/frameworks/termentry/icons/add_24.png</String>
+													<String>${framework}/frameworks/termentry/icons/add-24.png</String>
 												</field>
 												<field name="smallIconPath">
-													<String>${framework}/frameworks/termentry/icons/add_16.png</String>
+													<String>${framework}/frameworks/termentry/icons/add-16.png</String>
 												</field>
 												<field name="accessKey">
 													<String></String>
@@ -3528,10 +3528,10 @@
 													<String>${i18n(term.relations.add_description)}</String>
 												</field>
 												<field name="largeIconPath">
-													<String>${framework}/framework/icons/add_20.png</String>
+													<String>${framework}/frameworks/termentry/icons/add-24.png</String>
 												</field>
 												<field name="smallIconPath">
-													<String>${framework}/framework/icons/add_16.png</String>
+													<String>${framework}/frameworks/termentry/icons/add-16.png</String>
 												</field>
 												<field name="accessKey">
 													<String></String>
@@ -3598,10 +3598,10 @@
 													<String>${i18n(term.definitionSource.delete_description)}</String>
 												</field>
 												<field name="largeIconPath">
-													<String>${framework}/framework/icons/delete_20.png</String>
+													<String>${framework}/frameworks/termentry/icons/delete-24.png</String>
 												</field>
 												<field name="smallIconPath">
-													<String>${framework}/framework/icons/delete_16.png</String>
+													<String>${framework}/frameworks/termentry/icons/delete-16.png</String>
 												</field>
 												<field name="accessKey">
 													<String></String>
@@ -3660,10 +3660,10 @@
 													<String>${i18n(term.annotation.delete_description)}</String>
 												</field>
 												<field name="largeIconPath">
-													<String>${framework}/framework/icons/delete_20.png</String>
+													<String>${framework}/frameworks/termentry/icons/delete-24.png</String>
 												</field>
 												<field name="smallIconPath">
-													<String>${framework}/framework/icons/delete_16.png</String>
+													<String>${framework}/frameworks/termentry/icons/delete-16.png</String>
 												</field>
 												<field name="accessKey">
 													<String></String>
@@ -3722,10 +3722,10 @@
 													<String>${i18n(term.termContext.delete_description)}</String>
 												</field>
 												<field name="largeIconPath">
-													<String>${framework}/framework/icons/delete_20.png</String>
+													<String>${framework}/frameworks/termentry/icons/delete-24.png</String>
 												</field>
 												<field name="smallIconPath">
-													<String>${framework}/framework/icons/delete_16.png</String>
+													<String>${framework}/frameworks/termentry/icons/delete-16.png</String>
 												</field>
 												<field name="accessKey">
 													<String></String>
@@ -3784,10 +3784,10 @@
 													<String>${i18n(term.termSource.delete_description)}</String>
 												</field>
 												<field name="largeIconPath">
-													<String>${framework}/framework/icons/delete_20.png</String>
+													<String>${framework}/frameworks/termentry/icons/delete-24.png</String>
 												</field>
 												<field name="smallIconPath">
-													<String>${framework}/framework/icons/delete_16.png</String>
+													<String>${framework}/frameworks/termentry/icons/delete-16.png</String>
 												</field>
 												<field name="accessKey">
 													<String></String>
@@ -3846,10 +3846,10 @@
 													<String>${i18n(term.relations.delete_description)}</String>
 												</field>
 												<field name="largeIconPath">
-													<String>${framework}/framework/icons/delete_20.png</String>
+													<String>${framework}/frameworks/termentry/icons/delete-24.png</String>
 												</field>
 												<field name="smallIconPath">
-													<String>${framework}/framework/icons/delete_16.png</String>
+													<String>${framework}/frameworks/termentry/icons/delete-16.png</String>
 												</field>
 												<field name="accessKey">
 													<String></String>
@@ -3924,10 +3924,10 @@
 													<String>${i18n(term.antonyms.delete_description)}</String>
 												</field>
 												<field name="largeIconPath">
-													<String>${framework}/framework/icons/delete_20.png</String>
+													<String>${framework}/frameworks/termentry/icons/delete-24.png</String>
 												</field>
 												<field name="smallIconPath">
-													<String>${framework}/framework/icons/delete_16.png</String>
+													<String>${framework}/frameworks/termentry/icons/delete-16.png</String>
 												</field>
 												<field name="accessKey">
 													<String></String>
@@ -3986,10 +3986,10 @@
 													<String>${i18n(term.partsOf.delete_description)}</String>
 												</field>
 												<field name="largeIconPath">
-													<String>${framework}/framework/icons/delete_20.png</String>
+													<String>${framework}/frameworks/termentry/icons/delete-24.png</String>
 												</field>
 												<field name="smallIconPath">
-													<String>${framework}/framework/icons/delete_16.png</String>
+													<String>${framework}/frameworks/termentry/icons/delete-16.png</String>
 												</field>
 												<field name="accessKey">
 													<String></String>
@@ -4048,10 +4048,10 @@
 													<String>${i18n(term.superordinateConcepts.delete_description)}</String>
 												</field>
 												<field name="largeIconPath">
-													<String>${framework}/framework/icons/delete_20.png</String>
+													<String>${framework}/frameworks/termentry/icons/delete-24.png</String>
 												</field>
 												<field name="smallIconPath">
-													<String>${framework}/framework/icons/delete_16.png</String>
+													<String>${framework}/frameworks/termentry/icons/delete-16.png</String>
 												</field>
 												<field name="accessKey">
 													<String></String>
@@ -4110,10 +4110,10 @@
 													<String>${i18n(term.subordinateConcepts.delete_description)}</String>
 												</field>
 												<field name="largeIconPath">
-													<String>${framework}/framework/icons/delete_20.png</String>
+													<String>${framework}/frameworks/termentry/icons/delete-24.png</String>
 												</field>
 												<field name="smallIconPath">
-													<String>${framework}/framework/icons/delete_16.png</String>
+													<String>${framework}/frameworks/termentry/icons/delete-16.png</String>
 												</field>
 												<field name="accessKey">
 													<String></String>
@@ -4172,10 +4172,10 @@
 													<String>${i18n(term.relatedTerms.delete_description)}</String>
 												</field>
 												<field name="largeIconPath">
-													<String>${framework}/framework/icons/delete_20.png</String>
+													<String>${framework}/frameworks/termentry/icons/delete-24.png</String>
 												</field>
 												<field name="smallIconPath">
-													<String>${framework}/framework/icons/delete_16.png</String>
+													<String>${framework}/frameworks/termentry/icons/delete-16.png</String>
 												</field>
 												<field name="accessKey">
 													<String></String>
@@ -4234,10 +4234,10 @@
 													<String>${i18n(term.antonym.add_description)}</String>
 												</field>
 												<field name="largeIconPath">
-													<String>${framework}/framework/icons/add_20.png</String>
+													<String>${framework}/frameworks/termentry/icons/add-24.png</String>
 												</field>
 												<field name="smallIconPath">
-													<String>${framework}/framework/icons/add_16.png</String>
+													<String>${framework}/frameworks/termentry/icons/add-16.png</String>
 												</field>
 												<field name="accessKey">
 													<String></String>
@@ -4291,10 +4291,10 @@
 													<String>${i18n(term.partOf.add_description)}</String>
 												</field>
 												<field name="largeIconPath">
-													<String>${framework}/framework/icons/add_20.png</String>
+													<String>${framework}/frameworks/termentry/icons/add-24.png</String>
 												</field>
 												<field name="smallIconPath">
-													<String>${framework}/framework/icons/add_16.png</String>
+													<String>${framework}/frameworks/termentry/icons/add-16.png</String>
 												</field>
 												<field name="accessKey">
 													<String></String>
@@ -4348,10 +4348,10 @@
 													<String>${i18n(term.superordinateConcept.add_description)}</String>
 												</field>
 												<field name="largeIconPath">
-													<String>${framework}/framework/icons/add_20.png</String>
+													<String>${framework}/frameworks/termentry/icons/add-24.png</String>
 												</field>
 												<field name="smallIconPath">
-													<String>${framework}/framework/icons/add_16.png</String>
+													<String>${framework}/frameworks/termentry/icons/add-16.png</String>
 												</field>
 												<field name="accessKey">
 													<String></String>
@@ -4405,10 +4405,10 @@
 													<String>${i18n(term.subordinateConcept.add_description)}</String>
 												</field>
 												<field name="largeIconPath">
-													<String>${framework}/framework/icons/add_20.png</String>
+													<String>${framework}/frameworks/termentry/icons/add-24.png</String>
 												</field>
 												<field name="smallIconPath">
-													<String>${framework}/framework/icons/add_16.png</String>
+													<String>${framework}/frameworks/termentry/icons/add-16.png</String>
 												</field>
 												<field name="accessKey">
 													<String></String>
@@ -4462,10 +4462,10 @@
 													<String>${i18n(term.relatedTerm.add_description)}</String>
 												</field>
 												<field name="largeIconPath">
-													<String>${framework}/framework/icons/add_20.png</String>
+													<String>${framework}/frameworks/termentry/icons/add-24.png</String>
 												</field>
 												<field name="smallIconPath">
-													<String>${framework}/framework/icons/add_16.png</String>
+													<String>${framework}/frameworks/termentry/icons/add-16.png</String>
 												</field>
 												<field name="accessKey">
 													<String></String>
@@ -4519,10 +4519,10 @@
 													<String>${i18n(term.termRelation.delete_description)}</String>
 												</field>
 												<field name="largeIconPath">
-													<String>${framework}/framework/icons/delete_20.png</String>
+													<String>${framework}/frameworks/termentry/icons/delete-24.png</String>
 												</field>
 												<field name="smallIconPath">
-													<String>${framework}/framework/icons/delete_16.png</String>
+													<String>${framework}/frameworks/termentry/icons/delete-16.png</String>
 												</field>
 												<field name="accessKey">
 													<String></String>
@@ -4581,10 +4581,10 @@
 													<String>${i18n(term.termCommitteeMember.add_description)}</String>
 												</field>
 												<field name="largeIconPath">
-													<String>${framework}/framework/icons/add_20.png</String>
+													<String>${framework}/frameworks/termentry/icons/add-24.png</String>
 												</field>
 												<field name="smallIconPath">
-													<String>${framework}/framework/icons/add_16.png</String>
+													<String>${framework}/frameworks/termentry/icons/add-16.png</String>
 												</field>
 												<field name="accessKey">
 													<String></String>
@@ -4675,10 +4675,10 @@
 													<String>${i18n(term.agreedWith.delete_description)}</String>
 												</field>
 												<field name="largeIconPath">
-													<String>${framework}/frameworks/termentry/icons/delete_24.png</String>
+													<String>${framework}/frameworks/termentry/icons/delete-24.png</String>
 												</field>
 												<field name="smallIconPath">
-													<String>${framework}/frameworks/termentry/icons/delete_16.png</String>
+													<String>${framework}/frameworks/termentry/icons/delete-16.png</String>
 												</field>
 												<field name="accessKey">
 													<String></String>
@@ -4737,10 +4737,10 @@
 													<String>${i18n(term.termCommitteeMember.delete_description)}</String>
 												</field>
 												<field name="largeIconPath">
-													<String>${framework}/framework/icons/delete_20.png</String>
+													<String>${framework}/frameworks/termentry/icons/delete-24.png</String>
 												</field>
 												<field name="smallIconPath">
-													<String>${framework}/framework/icons/delete_16.png</String>
+													<String>${framework}/frameworks/termentry/icons/delete-16.png</String>
 												</field>
 												<field name="accessKey">
 													<String></String>
@@ -4793,16 +4793,16 @@
 													<String>term.concept-domain.add</String>
 												</field>
 												<field name="name">
-													<String>${i18n(term.domain.add)}</String>
+													<String>${i18n(term.concept-domain.add)}</String>
 												</field>
 												<field name="description">
 													<String>${i18n(term.concept-domain.add_description)}</String>
 												</field>
 												<field name="largeIconPath">
-													<String>${framework}/framework/icons/add_20.png</String>
+													<String>${framework}/frameworks/termentry/icons/add-24.png</String>
 												</field>
 												<field name="smallIconPath">
-													<String>${framework}/framework/icons/add_16.png</String>
+													<String>${framework}/frameworks/termentry/icons/add-16.png</String>
 												</field>
 												<field name="accessKey">
 													<String></String>
@@ -4893,10 +4893,10 @@
 													<String>${i18n(term.concept-domain.delete_description)}</String>
 												</field>
 												<field name="largeIconPath">
-													<String>${framework}/frameworks/termentry/icons/delete_16.png</String>
+													<String>${framework}/frameworks/termentry/icons/delete-24.png</String>
 												</field>
 												<field name="smallIconPath">
-													<String>${framework}/frameworks/termentry/icons/delete_24.png</String>
+													<String>${framework}/frameworks/termentry/icons/delete-16.png</String>
 												</field>
 												<field name="accessKey">
 													<String></String>
@@ -4955,10 +4955,10 @@
 													<String>${i18n(term.partOfSpeech.delete_description)}</String>
 												</field>
 												<field name="largeIconPath">
-													<String>${framework}/framework/icons/delete_20.png</String>
+													<String>${framework}/frameworks/termentry/icons/delete-24.png</String>
 												</field>
 												<field name="smallIconPath">
-													<String>${framework}/framework/icons/delete_16.png</String>
+													<String>${framework}/frameworks/termentry/icons/delete-16.png</String>
 												</field>
 												<field name="accessKey">
 													<String></String>
@@ -5017,10 +5017,10 @@
 													<String>${i18n(term.termNotation.delete_description)}</String>
 												</field>
 												<field name="largeIconPath">
-													<String>${framework}/framework/icons/delete_20.png</String>
+													<String>${framework}/frameworks/termentry/icons/delete-24.png</String>
 												</field>
 												<field name="smallIconPath">
-													<String>${framework}/framework/icons/delete_16.png</String>
+													<String>${framework}/frameworks/termentry/icons/delete-16.png</String>
 												</field>
 												<field name="accessKey">
 													<String></String>
@@ -5079,10 +5079,10 @@
 													<String>${i18n(term.fig.delete_description)}</String>
 												</field>
 												<field name="largeIconPath">
-													<String>${framework}/framework/icons/delete_20.png</String>
+													<String>${framework}/frameworks/termentry/icons/delete-24.png</String>
 												</field>
 												<field name="smallIconPath">
-													<String>${framework}/framework/icons/delete_16.png</String>
+													<String>${framework}/frameworks/termentry/icons/delete-16.png</String>
 												</field>
 												<field name="accessKey">
 													<String></String>
@@ -5141,10 +5141,10 @@
 													<String>${i18n(term.note.delete_description)}</String>
 												</field>
 												<field name="largeIconPath">
-													<String>${framework}/framework/icons/delete_20.png</String>
+													<String>${framework}/frameworks/termentry/icons/delete-24.png</String>
 												</field>
 												<field name="smallIconPath">
-													<String>${framework}/framework/icons/delete_16.png</String>
+													<String>${framework}/frameworks/termentry/icons/delete-16.png</String>
 												</field>
 												<field name="accessKey">
 													<String></String>
@@ -5203,7 +5203,7 @@
 													<String>${i18n(term.keyref.termRelation_description)}</String>
 												</field>
 												<field name="largeIconPath">
-													<String>${framework}/framework/icons/link_20.png</String>
+													<String>${framework}/framework/icons/link_24.png</String>
 												</field>
 												<field name="smallIconPath">
 													<String>${framework}/framework/icons/link_16.png</String>
@@ -5260,10 +5260,10 @@
 													<String>${i18n(term.imageReference.add_description)}</String>
 												</field>
 												<field name="largeIconPath">
-													<String></String>
+													<String>${framework}/frameworks/termentry/icons/add-24.png</String>
 												</field>
 												<field name="smallIconPath">
-													<String></String>
+													<String>${framework}/frameworks/termentry/icons/add-16.png</String>
 												</field>
 												<field name="accessKey">
 													<String></String>
@@ -5317,10 +5317,10 @@
 													<String>${i18n(term.image.delete_description)}</String>
 												</field>
 												<field name="largeIconPath">
-													<String>${framework}/framework/icons/delete_20.png</String>
+													<String>${framework}/frameworks/termentry/icons/delete-24.png</String>
 												</field>
 												<field name="smallIconPath">
-													<String>${framework}/framework/icons/delete_16.png</String>
+													<String>${framework}/frameworks/termentry/icons/delete-16.png</String>
 												</field>
 												<field name="accessKey">
 													<String></String>
@@ -5379,10 +5379,10 @@
 													<String>${i18n(term.fullForm.renameTo_description)}</String>
 												</field>
 												<field name="largeIconPath">
-													<String>${framework}/framework/icons/add_20.png</String>
+													<String>${framework}/frameworks/termentry/icons/replace-24.png</String>
 												</field>
 												<field name="smallIconPath">
-													<String>${framework}/framework/icons/add_16.png</String>
+													<String>${framework}/frameworks/termentry/icons/replace-16.png</String>
 												</field>
 												<field name="accessKey">
 													<String></String>
@@ -5445,10 +5445,10 @@
 													<String>${i18n(term.verb.renameTo_description)}</String>
 												</field>
 												<field name="largeIconPath">
-													<String>${framework}/framework/icons/add_20.png</String>
+													<String>${framework}/frameworks/termentry/icons/replace-24.png</String>
 												</field>
 												<field name="smallIconPath">
-													<String>${framework}/framework/icons/add_16.png</String>
+													<String>${framework}/frameworks/termentry/icons/replace-16.png</String>
 												</field>
 												<field name="accessKey">
 													<String></String>
@@ -5511,10 +5511,10 @@
 													<String>${i18n(term.acronym.renameTo_description)}</String>
 												</field>
 												<field name="largeIconPath">
-													<String>${framework}/frameworks/termentry/icons/add_24.png</String>
+													<String>${framework}/frameworks/termentry/icons/replace-24.png</String>
 												</field>
 												<field name="smallIconPath">
-													<String>${framework}/frameworks/termentry/icons/add_24.png</String>
+													<String>${framework}/frameworks/termentry/icons/replace-16.png</String>
 												</field>
 												<field name="accessKey">
 													<String></String>
@@ -5577,10 +5577,10 @@
 													<String>${i18n(term.abbreviation.renameTo)}</String>
 												</field>
 												<field name="largeIconPath">
-													<String>${framework}/frameworks/termentry/icons/add_24.png</String>
+													<String>${framework}/frameworks/termentry/icons/replace-24.png</String>
 												</field>
 												<field name="smallIconPath">
-													<String>${framework}/frameworks/termentry/icons/add_16.png</String>
+													<String>${framework}/frameworks/termentry/icons/replace-16.png</String>
 												</field>
 												<field name="accessKey">
 													<String></String>
@@ -5643,10 +5643,10 @@
 													<String>${i18n(term.instancesOf.add_description)}</String>
 												</field>
 												<field name="largeIconPath">
-													<String>${framework}/framework/icons/add_20.png</String>
+													<String>${framework}/frameworks/termentry/icons/add-24.png</String>
 												</field>
 												<field name="smallIconPath">
-													<String>${framework}/framework/icons/add_16.png</String>
+													<String>${framework}/frameworks/termentry/icons/add-16.png</String>
 												</field>
 												<field name="accessKey">
 													<String></String>
@@ -5763,10 +5763,10 @@
 													<String>${i18n(term.instanceOf.add_description)}</String>
 												</field>
 												<field name="largeIconPath">
-													<String>${framework}/framework/icons/add_20.png</String>
+													<String>${framework}/frameworks/termentry/icons/add-24.png</String>
 												</field>
 												<field name="smallIconPath">
-													<String>${framework}/framework/icons/add_16.png</String>
+													<String>${framework}/frameworks/termentry/icons/add-16.png</String>
 												</field>
 												<field name="accessKey">
 													<String></String>
@@ -5820,10 +5820,10 @@
 													<String>${i18n(term.instancesOf.delete_description)}</String>
 												</field>
 												<field name="largeIconPath">
-													<String>${framework}/framework/icons/delete_20.png</String>
+													<String>${framework}/frameworks/termentry/icons/delete-24.png</String>
 												</field>
 												<field name="smallIconPath">
-													<String>${framework}/framework/icons/delete_16.png</String>
+													<String>${framework}/frameworks/termentry/icons/delete-16.png</String>
 												</field>
 												<field name="accessKey">
 													<String></String>
@@ -5882,7 +5882,7 @@
 													<String>${i18n(term.termRelation.add_description)}</String>
 												</field>
 												<field name="largeIconPath">
-													<String>${framework}/framework/icons/link_20.png</String>
+													<String>${framework}/framework/icons/link_24.png</String>
 												</field>
 												<field name="smallIconPath">
 													<String>${framework}/framework/icons/link_16.png</String>
@@ -5939,7 +5939,7 @@
 													<String>${i18n(term.open.termRelation_description)}</String>
 												</field>
 												<field name="largeIconPath">
-													<String>${framework}/framework/icons/link_20.png</String>
+													<String>${framework}/framework/icons/link_24.png</String>
 												</field>
 												<field name="smallIconPath">
 													<String>${framework}/framework/icons/link_16.png</String>
@@ -6062,10 +6062,10 @@
 													<String>${i18n(term.superordinateConcept.delete_description)}</String>
 												</field>
 												<field name="largeIconPath">
-													<String>${framework}/framework/icons/delete_20.png</String>
+													<String>${framework}/frameworks/termentry/icons/delete-24.png</String>
 												</field>
 												<field name="smallIconPath">
-													<String>${framework}/framework/icons/delete_16.png</String>
+													<String>${framework}/frameworks/termentry/icons/delete-16.png</String>
 												</field>
 												<field name="accessKey">
 													<String></String>
@@ -6124,10 +6124,10 @@
 													<String>${i18n(term.instanceOf.delete_description)}</String>
 												</field>
 												<field name="largeIconPath">
-													<String>${framework}/framework/icons/delete_20.png</String>
+													<String>${framework}/frameworks/termentry/icons/delete-24.png</String>
 												</field>
 												<field name="smallIconPath">
-													<String>${framework}/framework/icons/delete_16.png</String>
+													<String>${framework}/frameworks/termentry/icons/delete-16.png</String>
 												</field>
 												<field name="accessKey">
 													<String></String>
@@ -6186,10 +6186,10 @@
 													<String>${i18n(term.antonym.delete_description)}</String>
 												</field>
 												<field name="largeIconPath">
-													<String>${framework}/framework/icons/delete_20.png</String>
+													<String>${framework}/frameworks/termentry/icons/delete-24.png</String>
 												</field>
 												<field name="smallIconPath">
-													<String>${framework}/framework/icons/delete_16.png</String>
+													<String>${framework}/frameworks/termentry/icons/delete-16.png</String>
 												</field>
 												<field name="accessKey">
 													<String></String>
@@ -6248,10 +6248,10 @@
 													<String>${i18n(term.partOf.delete_description)}</String>
 												</field>
 												<field name="largeIconPath">
-													<String>${framework}/framework/icons/delete_20.png</String>
+													<String>${framework}/frameworks/termentry/icons/delete-24.png</String>
 												</field>
 												<field name="smallIconPath">
-													<String>${framework}/framework/icons/delete_16.png</String>
+													<String>${framework}/frameworks/termentry/icons/delete-16.png</String>
 												</field>
 												<field name="accessKey">
 													<String></String>
@@ -6310,10 +6310,10 @@
 													<String>${i18n(term.subordinateConcept.delete_description)}</String>
 												</field>
 												<field name="largeIconPath">
-													<String>${framework}/framework/icons/delete_20.png</String>
+													<String>${framework}/frameworks/termentry/icons/delete-24.png</String>
 												</field>
 												<field name="smallIconPath">
-													<String>${framework}/framework/icons/delete_16.png</String>
+													<String>${framework}/frameworks/termentry/icons/delete-16.png</String>
 												</field>
 												<field name="accessKey">
 													<String></String>
@@ -6372,10 +6372,10 @@
 													<String>${i18n(term.acronym.delete_description)}</String>
 												</field>
 												<field name="largeIconPath">
-													<String>${framework}/frameworks/termentry/icons/delete_24.png</String>
+													<String>${framework}/frameworks/termentry/icons/delete-24.png</String>
 												</field>
 												<field name="smallIconPath">
-													<String>${framework}/frameworks/termentry/icons/delete_16.png</String>
+													<String>${framework}/frameworks/termentry/icons/delete-16.png</String>
 												</field>
 												<field name="accessKey">
 													<String></String>
@@ -6434,10 +6434,10 @@
 													<String>${i18n(term.equation-figure.delete_description)}</String>
 												</field>
 												<field name="largeIconPath">
-													<String>${framework}/framework/icons/delete_20.png</String>
+													<String>${framework}/frameworks/termentry/icons/delete-24.png</String>
 												</field>
 												<field name="smallIconPath">
-													<String>${framework}/framework/icons/delete_16.png</String>
+													<String>${framework}/frameworks/termentry/icons/delete-16.png</String>
 												</field>
 												<field name="accessKey">
 													<String></String>
@@ -6496,10 +6496,10 @@
 													<String>${i18n(term.alt.delete_description)}</String>
 												</field>
 												<field name="largeIconPath">
-													<String>${framework}/frameworks/termentry/icons/delete_24.png</String>
+													<String>${framework}/frameworks/termentry/icons/delete-24.png</String>
 												</field>
 												<field name="smallIconPath">
-													<String>${framework}/frameworks/termentry/icons/delete_16.png</String>
+													<String>${framework}/frameworks/termentry/icons/delete-16.png</String>
 												</field>
 												<field name="accessKey">
 													<String></String>
@@ -6558,10 +6558,10 @@
 													<String>${i18n(term.alt.add_description)}</String>
 												</field>
 												<field name="largeIconPath">
-													<String>${framework}/frameworks/termentry/icons/add_24.png</String>
+													<String>${framework}/frameworks/termentry/icons/add-24.png</String>
 												</field>
 												<field name="smallIconPath">
-													<String>${framework}/frameworks/termentry/icons/add_16.png</String>
+													<String>${framework}/frameworks/termentry/icons/add-16.png</String>
 												</field>
 												<field name="accessKey">
 													<String></String>
@@ -6628,10 +6628,10 @@
 													<String>${i18n(term.termContextText.delete_description)}</String>
 												</field>
 												<field name="largeIconPath">
-													<String>${framework}/framework/icons/delete_20.png</String>
+													<String>${framework}/frameworks/termentry/icons/delete-24.png</String>
 												</field>
 												<field name="smallIconPath">
-													<String>${framework}/framework/icons/delete_16.png</String>
+													<String>${framework}/frameworks/termentry/icons/delete-16.png</String>
 												</field>
 												<field name="accessKey">
 													<String></String>
@@ -6706,10 +6706,10 @@
 													<String>${i18n(term.termContextSource.delete_description)}</String>
 												</field>
 												<field name="largeIconPath">
-													<String>${framework}/framework/icons/delete_20.png</String>
+													<String>${framework}/frameworks/termentry/icons/delete-24.png</String>
 												</field>
 												<field name="smallIconPath">
-													<String>${framework}/framework/icons/delete_16.png</String>
+													<String>${framework}/frameworks/termentry/icons/delete-16.png</String>
 												</field>
 												<field name="accessKey">
 													<String></String>
@@ -6768,10 +6768,10 @@
 													<String>${i18n(term.termContextText.add_description)}</String>
 												</field>
 												<field name="largeIconPath">
-													<String>${framework}/framework/icons/add_20.png</String>
+													<String>${framework}/frameworks/termentry/icons/add-24.png</String>
 												</field>
 												<field name="smallIconPath">
-													<String>${framework}/framework/icons/add_16.png</String>
+													<String>${framework}/frameworks/termentry/icons/add-16.png</String>
 												</field>
 												<field name="accessKey">
 													<String></String>
@@ -6895,7 +6895,7 @@
 													<String></String>
 												</field>
 												<field name="largeIconPath">
-													<String>${framework}/framework/icons/link_20.png</String>
+													<String>${framework}/framework/icons/link_24.png</String>
 												</field>
 												<field name="smallIconPath">
 													<String>${framework}/framework/icons/link_16.png</String>
@@ -6957,10 +6957,10 @@
 													<String>${i18n(term.altDefinition.add_description)}</String>
 												</field>
 												<field name="largeIconPath">
-													<String>${framework}/framework/icons/add_20.png</String>
+													<String>${framework}/frameworks/termentry/icons/add-24.png</String>
 												</field>
 												<field name="smallIconPath">
-													<String>${framework}/framework/icons/add_16.png</String>
+													<String>${framework}/frameworks/termentry/icons/add-16.png</String>
 												</field>
 												<field name="accessKey">
 													<String></String>
@@ -7033,10 +7033,10 @@
 													<String>${i18n(term.altDefinition.delete_description)}</String>
 												</field>
 												<field name="largeIconPath">
-													<String>${framework}/framework/icons/delete_20.png</String>
+													<String>${framework}/frameworks/termentry/icons/delete-24.png</String>
 												</field>
 												<field name="smallIconPath">
-													<String>${framework}/framework/icons/delete_16.png</String>
+													<String>${framework}/frameworks/termentry/icons/delete-16.png</String>
 												</field>
 												<field name="accessKey">
 													<String></String>
@@ -7095,10 +7095,10 @@
 													<String>${i18n(term.renameTo_description)}</String>
 												</field>
 												<field name="largeIconPath">
-													<String></String>
+													<String>${framework}/frameworks/termentry/icons/rename-24.png</String>
 												</field>
 												<field name="smallIconPath">
-													<String></String>
+													<String>${framework}/frameworks/termentry/icons/rename-16.png</String>
 												</field>
 												<field name="accessKey">
 													<String></String>
@@ -7157,10 +7157,10 @@
 													<String>${i18n(term.renameTo_description)}</String>
 												</field>
 												<field name="largeIconPath">
-													<String></String>
+													<String>${framework}/frameworks/termentry/icons/replace-24.png</String>
 												</field>
 												<field name="smallIconPath">
-													<String></String>
+													<String>${framework}/frameworks/termentry/icons/replace-16.png</String>
 												</field>
 												<field name="accessKey">
 													<String></String>
@@ -7219,10 +7219,10 @@
 													<String>${i18n(term.url.reference_description)}</String>
 												</field>
 												<field name="largeIconPath">
-													<String></String>
+													<String>${framework}/frameworks/termentry/icons/html5-24.png</String>
 												</field>
 												<field name="smallIconPath">
-													<String></String>
+													<String>${framework}/frameworks/termentry/icons/html5-16.png</String>
 												</field>
 												<field name="accessKey">
 													<String></String>
@@ -7363,10 +7363,10 @@
 													<String>${i18n(term.term-domains.add_description)}</String>
 												</field>
 												<field name="largeIconPath">
-													<String>${framework}/framework/icons/add_20.png</String>
+													<String>${framework}/frameworks/termentry/icons/add-24.png</String>
 												</field>
 												<field name="smallIconPath">
-													<String>${framework}/framework/icons/add_16.png</String>
+													<String>${framework}/frameworks/termentry/icons/add-16.png</String>
 												</field>
 												<field name="accessKey">
 													<String></String>
@@ -7435,10 +7435,10 @@
 													<String>${i18n(term.antonym.add_description)} href</String>
 												</field>
 												<field name="largeIconPath">
-													<String>${framework}/frameworks/termentry/icons/add_20.png</String>
+													<String>${framework}/frameworks/termentry/icons/add-24.png</String>
 												</field>
 												<field name="smallIconPath">
-													<String>${framework}/frameworks/termentry/icons/add_16.png</String>
+													<String>${framework}/frameworks/termentry/icons/add-16.png</String>
 												</field>
 												<field name="accessKey">
 													<String></String>
@@ -7559,10 +7559,10 @@
 													<String>${i18n(term.concept-domains.delete_description)}</String>
 												</field>
 												<field name="largeIconPath">
-													<String>${framework}/framework/icons/delete_20.png</String>
+													<String>${framework}/frameworks/termentry/icons/delete-24.png</String>
 												</field>
 												<field name="smallIconPath">
-													<String>${framework}/framework/icons/delete_16.png</String>
+													<String>${framework}/frameworks/termentry/icons/delete-16.png</String>
 												</field>
 												<field name="accessKey">
 													<String></String>
@@ -7621,10 +7621,10 @@
 													<String>${i18n(term.term-domains.delete_description)}</String>
 												</field>
 												<field name="largeIconPath">
-													<String>${framework}/framework/icons/delete_20.png</String>
+													<String>${framework}/frameworks/termentry/icons/delete-24.png</String>
 												</field>
 												<field name="smallIconPath">
-													<String>${framework}/framework/icons/delete_16.png</String>
+													<String>${framework}/frameworks/termentry/icons/delete-16.png</String>
 												</field>
 												<field name="accessKey">
 													<String></String>
@@ -7683,10 +7683,10 @@
 													<String>${i18n(term.term-domain.add_description)}</String>
 												</field>
 												<field name="largeIconPath">
-													<String>${framework}/framework/icons/add_20.png</String>
+													<String>${framework}/frameworks/termentry/icons/add-24.png</String>
 												</field>
 												<field name="smallIconPath">
-													<String>${framework}/framework/icons/add_16.png</String>
+													<String>${framework}/frameworks/termentry/icons/add-16.png</String>
 												</field>
 												<field name="accessKey">
 													<String></String>
@@ -7777,10 +7777,10 @@
 													<String>${i18n(term.term-domain.delete_description)}</String>
 												</field>
 												<field name="largeIconPath">
-													<String>${framework}/frameworks/termentry/icons/delete_16.png</String>
+													<String>${framework}/frameworks/termentry/icons/delete-16.png</String>
 												</field>
 												<field name="smallIconPath">
-													<String>${framework}/frameworks/termentry/icons/delete_24.png</String>
+													<String>${framework}/frameworks/termentry/icons/delete-24.png</String>
 												</field>
 												<field name="accessKey">
 													<String></String>
diff --git a/frameworks/termentry/css/termentry.css b/frameworks/termentry/css/termentry.css
index d191ca0..7d05c3c 100644
--- a/frameworks/termentry/css/termentry.css
+++ b/frameworks/termentry/css/termentry.css
@@ -258,6 +258,7 @@
             label, '${i18n(term.relations)}',
             transparent, 'true',
             fontInherit, 'true',
+            actionStyle, 'both',
             actions,
             oxy_action_list(
                 oxy_action(id, 'term.antonyms.add'),
@@ -311,6 +312,7 @@
            label, '${i18n(term.definitionSource)}',
            transparent, 'true',
            fontInherit, 'true',
+           actionStyle, 'both',
            actions,
            oxy_action_list(
                oxy_action(id, 'term.sourceName.add'),
@@ -340,6 +342,7 @@
             label, '${i18n(term.equation-figure)}',
             transparent, 'true',
             fontInherit, 'true',
+            actionStyle, 'both',
             actions,
             oxy_action_list(
                 oxy_action(id, 'term.equation-figure.delete')
@@ -367,6 +370,7 @@
             label, '${i18n(term.fig)}',
             transparent, 'true',
             fontInherit, 'true',
+            actionStyle, 'both',
             actions,
             oxy_action_list(
                 oxy_action(id, 'term.fig.delete')
@@ -386,6 +390,7 @@
         label, '${i18n(term.image)}',
         transparent, 'true',
         fontInherit, 'true',
+        actionStyle, 'both',
         actions,
         oxy_action_list(
             oxy_action(id, 'term.imageReference.add'),
@@ -410,6 +415,7 @@
         label, '${i18n(term.alt)}',
         transparent, 'true',
         fontInherit, 'true',
+        actionStyle, 'both',
         actions,
         oxy_action_list(
             oxy_action(id, 'term.alt.delete')
@@ -426,6 +432,7 @@
             label, '${i18n(term.termSource)}',
             transparent, 'true',
             fontInherit, 'true',
+            actionStyle, 'both',
             actions,
             oxy_action_list(
                 oxy_action(id, 'term.sourceName.add'),
@@ -446,6 +453,7 @@
         label, '${i18n(term.sourceName)}',
         transparent, 'true',
         fontInherit, 'true',
+        actionStyle, 'both',
         actions,
         oxy_action_list(
             oxy_action(id, 'term.sourceReference.renameTo'),
@@ -463,6 +471,7 @@
             label, '${i18n(term.sourceReference)}',
             transparent, 'true',
             fontInherit, 'true',
+            actionStyle, 'both',
             actions,
             oxy_action_list(
                 oxy_action(id, 'term.sourceName.renameTo'),
@@ -528,6 +537,7 @@
         label, '${i18n(term.annotation)}',
         transparent, 'true',
         fontInherit, 'true',
+        actionStyle, 'both',
         actions,
         oxy_action_list(
             oxy_action(id, 'term.annotation.delete')
@@ -544,6 +554,7 @@
             label, '${i18n(term.termContext)}',
             transparent, 'true',
             fontInherit, 'true',
+            actionStyle, 'both',
             actions,
             oxy_action_list(
                 oxy_action(id, 'term.termContextText.add'),
@@ -561,6 +572,7 @@
             label, '${i18n(term.termContextSource)}',
             transparent, 'true',
             fontInherit, 'true',
+            actionStyle, 'both',
             actions,
             oxy_action_list(
                 oxy_action(id, 'term.sourceName.add'),
@@ -593,6 +605,7 @@
             label, '${i18n(term.partOfSpeech)}',
             transparent, 'true',
             fontInherit, 'true',
+            actionStyle, 'both',
             actions,
             oxy_action_list(
                 oxy_action(id, 'term.partOfSpeech.delete')
@@ -646,6 +659,7 @@
             label, '${i18n(term.termLevel)}',
             transparent, 'true',
             fontInherit, 'true',
+            actionStyle, 'both',
             actions,
             oxy_action_list(
                 oxy_action(id, 'term.abbreviation.add'),
@@ -685,6 +699,7 @@
             label, '${i18n(term.concept-domains)}',
             transparent, 'true',
             fontInherit, 'true',
+            actionStyle, 'both',
             actions,
             oxy_action_list(
                 oxy_action(id, 'term.concept-domain.add'),
@@ -702,6 +717,7 @@
             label, '${i18n(term.term-domains)}',
             transparent, 'true',
             fontInherit, 'true',
+            actionStyle, 'both',
             actions,
             oxy_action_list(
                 oxy_action(id, 'term.term-domain.add'),
@@ -719,6 +735,7 @@
             label, '${i18n(term.concept-domain)}',
             transparent, 'true',
             fontInherit, 'true',
+            actionStyle, 'both',
             actions,
             oxy_action_list(
                 oxy_action(id, 'term.concept-domain.add'),
@@ -745,6 +762,7 @@
             label, '${i18n(term.term-domain)}',
             transparent, 'true',
             fontInherit, 'true',
+            actionStyle, 'both',
             actions,
             oxy_action_list(
                 oxy_action(id, 'term.term-domain.add'),
@@ -773,6 +791,7 @@
             label, '${i18n(term.agreedWith)}',
             transparent, 'true',
             fontInherit, 'true',
+            actionStyle, 'both',
             actions,
             oxy_action_list(
                 oxy_action(id, 'term.termCommitteeMember.add'),
@@ -809,6 +828,7 @@
         label, '${i18n(term.termCommitteeMember)}',
         transparent, 'true',
         fontInherit, 'true',
+        actionStyle, 'both',
         actions,
         oxy_action_list(
             oxy_action(id, 'term.termCommitteeMember.add'),
@@ -841,6 +861,7 @@
                 "),
             transparent, 'true',
             fontInherit, 'true',
+            actionStyle, 'both',
             actions,
             oxy_action_list(
                 oxy_action(id, 'term.abbreviation.add'),
@@ -1047,6 +1068,7 @@
             label, '${i18n(term.termVariant)}',
             transparent, 'true',
             fontInherit, 'true',
+            actionStyle, 'both',
             actions,
             oxy_action_list(
                 oxy_action(id, 'term.termSource.add'),
@@ -1121,6 +1143,7 @@
                 label, '${i18n(term.antonyms)}',
                 transparent, 'true',
                 fontInherit, 'true',
+                actionStyle, 'both',
                 actions,
                 oxy_action_list(
                     oxy_action(id, 'term.antonym.add.href'),
@@ -1137,6 +1160,7 @@
                 label, '${i18n(term.antonyms)}',
                 transparent, 'true',
                 fontInherit, 'true',
+                actionStyle, 'both',
                 actions,
                 oxy_action_list(
                     oxy_action(id, 'term.antonym.add'),
@@ -1157,6 +1181,7 @@
             label, '${i18n(term.antonym)}',
             transparent, 'true',
             fontInherit, 'true',
+            actionStyle, 'both',
             actions,
             oxy_action_list(
                 oxy_action(id, 'term.antonym.add'),
@@ -1174,6 +1199,7 @@
             label, '${i18n(term.instancesOf)}',
             transparent, 'true',
             fontInherit, 'true',
+            actionStyle, 'both',
             actions,
             oxy_action_list(
                 oxy_action(id, 'term.instanceOf.add'),
@@ -1193,6 +1219,7 @@
             label, '${i18n(term.instanceOf)}',
             transparent, 'true',
             fontInherit, 'true',
+            actionStyle, 'both',
             actions,
             oxy_action_list(
                 oxy_action(id, 'term.instanceOf.add'),
@@ -1210,6 +1237,7 @@
         label, '${i18n(term.partsOf)}',
         transparent, 'true',
         fontInherit, 'true',
+        actionStyle, 'both',
         actions,
         oxy_action_list(
             oxy_action(id, 'term.partOf.add'),
@@ -1227,6 +1255,7 @@
             label, '${i18n(term.partOf)}',
             transparent, 'true',
             fontInherit, 'true',
+            actionStyle, 'both',
             actions,
             oxy_action_list(
                 oxy_action(id, 'term.partOf.add'),
@@ -1244,6 +1273,7 @@
             label, '${i18n(term.superordinateConcepts)}',
             transparent, 'true',
             fontInherit, 'true',
+            actionStyle, 'both',
             actions,
             oxy_action_list(
                 oxy_action(id, 'term.superordinateConcept.add'),
@@ -1261,6 +1291,7 @@
             label, '${i18n(term.superordinateConcept)}',
             transparent, 'true',
             fontInherit, 'true',
+            actionStyle, 'both',
             actions,
             oxy_action_list(
                 oxy_action(id, 'term.superordinateConcept.add'),
@@ -1296,6 +1327,7 @@
             label, '${i18n(term.subordinateConcepts)}',
             transparent, 'true',
             fontInherit, 'true',
+            actionStyle, 'both',
             actions,
             oxy_action_list(
                 oxy_action(id, 'term.subordinateConcept.add'),
@@ -1313,6 +1345,7 @@
             label, '${i18n(term.subordinateConcept)}',
             transparent, 'true',
             fontInherit, 'true',
+            actionStyle, 'both',
             actions,
             oxy_action_list(
                 oxy_action(id, 'term.subordinateConcept.add'),
@@ -1330,6 +1363,7 @@
             label, '${i18n(term.relatedTerms)}',
             transparent, 'true',
             fontInherit, 'true',
+            actionStyle, 'both',
             actions,
             oxy_action_list(
                 oxy_action(id, 'term.relatedTerm.add'),
@@ -1347,6 +1381,7 @@
             label, '${i18n(term.relatedTerm)}',
             transparent, 'true',
             fontInherit, 'true',
+            actionStyle, 'both',
             actions,
             oxy_action_list(
                 oxy_action(id, 'term.relatedTerm.add'),
diff --git a/frameworks/termentry/icons/add-16.png b/frameworks/termentry/icons/add-16.png
new file mode 100644
index 0000000..1c9047b
Binary files /dev/null and b/frameworks/termentry/icons/add-16.png differ
diff --git a/frameworks/termentry/icons/add-24.png b/frameworks/termentry/icons/add-24.png
new file mode 100644
index 0000000..e450ac5
Binary files /dev/null and b/frameworks/termentry/icons/add-24.png differ
diff --git a/frameworks/termentry/icons/add.svg b/frameworks/termentry/icons/add.svg
index a8d4f2d..49d57c5 100644
--- a/frameworks/termentry/icons/add.svg
+++ b/frameworks/termentry/icons/add.svg
@@ -2,23 +2,23 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 
 <svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="5.6461525mm"
-   height="5.6444445mm"
-   viewBox="0 0 20.006052 20"
+   width="24"
+   height="24"
+   viewBox="0 0 22.5 22.5"
    id="svg4023"
    version="1.1"
-   inkscape:version="0.91 r13725"
+   inkscape:version="1.3 (0e150ed6c4, 2023-07-21)"
    sodipodi:docname="add.svg"
-   inkscape:export-filename="/home/stefan/workspace/org.doctales.terminology/framework/icons/add_20.png"
-   inkscape:export-xdpi="89.972771"
-   inkscape:export-ydpi="89.972771">
+   inkscape:export-filename="add-16.png"
+   inkscape:export-xdpi="64"
+   inkscape:export-ydpi="64"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4025" />
   <sodipodi:namedview
@@ -29,8 +29,8 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="15.839192"
-     inkscape:cx="-8.3437482"
-     inkscape:cy="-2.9676059"
+     inkscape:cx="-8.3653257"
+     inkscape:cy="12.184965"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="false"
@@ -39,10 +39,13 @@
      fit-margin-right="0"
      fit-margin-bottom="0"
      inkscape:window-width="1920"
-     inkscape:window-height="1028"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1" />
+     inkscape:window-height="1017"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:showpageshadow="2"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1" />
   <metadata
      id="metadata4028">
     <rdf:RDF>
@@ -51,7 +54,6 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -60,12 +62,18 @@
      inkscape:groupmode="layer"
      id="layer1"
      transform="translate(857.85919,381.21172)">
-    <path
-       inkscape:connector-curvature="0"
-       style="fill:#1d1d1b"
-       d="m -838.97869,-373.69181 -6.39975,0 0,-6.39441 c 0,-0.62475 -0.50475,-1.1255 -1.12551,-1.1255 l -2.70848,0 c -0.62276,0 -1.12551,0.50541 -1.12551,1.1255 l 0,6.39441 -6.39436,0 c -0.62548,0 -1.12689,0.50475 -1.12689,1.12619 l 0,2.70646 c 0,0.62544 0.50475,1.12619 1.12689,1.12619 l 6.39436,0 0,6.39574 c 0,0.62276 0.50541,1.12551 1.12551,1.12551 l 2.70848,0 c 0.62276,0 1.12551,-0.50675 1.12551,-1.12551 l 0,-6.39574 6.39975,0 c 0.62541,0 1.1255,-0.50475 1.1255,-1.12619 l 0,-2.70646 c 0.006,-0.6221 -0.50009,-1.12619 -1.1255,-1.12619 z"
-       id="path206"
-       inkscape:export-xdpi="73"
-       inkscape:export-ydpi="73" />
+    <g
+       id="g2"
+       style="fill:#008000;stroke:#427b00;stroke-opacity:1"
+       transform="translate(0.359295,1.602255)">
+      <path
+         style="fill:#008000;fill-opacity:0.204753;stroke:#427b00;stroke-width:1.875;stroke-linecap:round;stroke-miterlimit:1;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
+         d="m -846.96848,-378.60742 v 14.08689"
+         id="path1" />
+      <path
+         style="fill:#008000;fill-opacity:0.204753;stroke:#427b00;stroke-width:1.875;stroke-linecap:round;stroke-miterlimit:1;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
+         d="m -839.92504,-371.56397 h -14.08689"
+         id="path2" />
+    </g>
   </g>
 </svg>
diff --git a/frameworks/termentry/icons/add_16.png b/frameworks/termentry/icons/add_16.png
deleted file mode 100644
index 060f4d5..0000000
Binary files a/frameworks/termentry/icons/add_16.png and /dev/null differ
diff --git a/frameworks/termentry/icons/add_24.png b/frameworks/termentry/icons/add_24.png
deleted file mode 100644
index c75e89a..0000000
Binary files a/frameworks/termentry/icons/add_24.png and /dev/null differ
diff --git a/frameworks/termentry/icons/delete-16.png b/frameworks/termentry/icons/delete-16.png
new file mode 100644
index 0000000..ce06964
Binary files /dev/null and b/frameworks/termentry/icons/delete-16.png differ
diff --git a/frameworks/termentry/icons/delete-24.png b/frameworks/termentry/icons/delete-24.png
new file mode 100644
index 0000000..ae0f818
Binary files /dev/null and b/frameworks/termentry/icons/delete-24.png differ
diff --git a/frameworks/termentry/icons/delete.svg b/frameworks/termentry/icons/delete.svg
index 41fac8f..09330d4 100644
--- a/frameworks/termentry/icons/delete.svg
+++ b/frameworks/termentry/icons/delete.svg
@@ -2,22 +2,25 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 
 <svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="5.6444459mm"
-   height="5.6445608mm"
-   viewBox="0 0 20.000005 20.000412"
-   id="svg3981"
+   width="24"
+   height="24"
+   viewBox="0 0 22.5 22.5"
+   id="svg4023"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="delete.svg">
+   inkscape:version="1.3 (0e150ed6c4, 2023-07-21)"
+   sodipodi:docname="delete.svg"
+   inkscape:export-filename="delete-24.png"
+   inkscape:export-xdpi="96"
+   inkscape:export-ydpi="96"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
-     id="defs3983" />
+     id="defs4025" />
   <sodipodi:namedview
      id="base"
      pagecolor="#ffffff"
@@ -25,9 +28,9 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="11.2"
-     inkscape:cx="16.370479"
-     inkscape:cy="2.9629058"
+     inkscape:zoom="15.839192"
+     inkscape:cx="-8.3653257"
+     inkscape:cy="12.184965"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="false"
@@ -36,19 +39,21 @@
      fit-margin-right="0"
      fit-margin-bottom="0"
      inkscape:window-width="1920"
-     inkscape:window-height="1028"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1" />
+     inkscape:window-height="1017"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:showpageshadow="2"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1" />
   <metadata
-     id="metadata3986">
+     id="metadata4028">
     <rdf:RDF>
       <cc:Work
          rdf:about="">
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -56,11 +61,19 @@
      inkscape:label="Ebene 1"
      inkscape:groupmode="layer"
      id="layer1"
-     transform="translate(-122.28121,-561.50969)">
-    <path
-       inkscape:connector-curvature="0"
-       style="fill:#1d1d1b"
-       d="m 141.53982,577.20022 -5.69703,-5.69619 5.6962,-5.69454 c 0.98963,-0.98879 0.98963,-2.58319 0,-3.55783 -0.98963,-0.98963 -2.58153,-0.98963 -3.55783,0.002 l -5.70287,5.69619 -5.69703,-5.69786 c -0.98713,-0.98963 -2.5782,-0.98963 -3.55783,0.002 -0.98963,0.98296 -0.98963,2.57903 0,3.55783 l 5.69703,5.6962 -5.69703,5.70286 c -0.98963,0.98546 -0.98963,2.58153 0,3.55783 0.49315,0.49398 1.13124,0.74139 1.78683,0.74139 0.64226,0 1.29285,-0.24741 1.78766,-0.74139 l 5.69703,-5.69786 5.69704,5.6962 c 0.49148,0.49564 1.1354,0.74138 1.78516,0.74138 0.64226,0 1.29451,-0.24574 1.78766,-0.74138 0.95048,-0.98547 0.95048,-2.57987 -0.025,-3.56617 z"
-       id="path436" />
+     transform="translate(857.85919,381.21172)">
+    <g
+       id="g2"
+       style="fill:none;stroke:#f13412;stroke-opacity:1"
+       transform="rotate(45,-848.72293,-370.32914)">
+      <path
+         style="fill:none;fill-opacity:0.204753;stroke:#f13412;stroke-width:1.875;stroke-linecap:round;stroke-miterlimit:1;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
+         d="m -846.96848,-378.60742 v 14.08689"
+         id="path1" />
+      <path
+         style="fill:none;fill-opacity:0.204753;stroke:#f13412;stroke-width:1.875;stroke-linecap:round;stroke-miterlimit:1;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
+         d="m -839.92504,-371.56397 h -14.08689"
+         id="path2" />
+    </g>
   </g>
 </svg>
diff --git a/frameworks/termentry/icons/delete_16.png b/frameworks/termentry/icons/delete_16.png
deleted file mode 100644
index 7714298..0000000
Binary files a/frameworks/termentry/icons/delete_16.png and /dev/null differ
diff --git a/frameworks/termentry/icons/delete_24.png b/frameworks/termentry/icons/delete_24.png
deleted file mode 100644
index e877e7b..0000000
Binary files a/frameworks/termentry/icons/delete_24.png and /dev/null differ
diff --git a/frameworks/termentry/icons/html5-16.png b/frameworks/termentry/icons/html5-16.png
new file mode 100644
index 0000000..665c679
Binary files /dev/null and b/frameworks/termentry/icons/html5-16.png differ
diff --git a/frameworks/termentry/icons/html5-24.png b/frameworks/termentry/icons/html5-24.png
new file mode 100644
index 0000000..f432760
Binary files /dev/null and b/frameworks/termentry/icons/html5-24.png differ
diff --git a/frameworks/termentry/icons/html5.svg b/frameworks/termentry/icons/html5.svg
new file mode 100644
index 0000000..9d1bf0e
--- /dev/null
+++ b/frameworks/termentry/icons/html5.svg
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   viewBox="0 0 500 500"
+   version="1.1"
+   id="svg5"
+   sodipodi:docname="html5.svg"
+   inkscape:export-filename="html5-24.png"
+   inkscape:export-xdpi="4.6079998"
+   inkscape:export-ydpi="4.6079998"
+   width="500"
+   height="500"
+   inkscape:version="1.3 (0e150ed6c4, 2023-07-21)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
+  <defs
+     id="defs5" />
+  <sodipodi:namedview
+     id="namedview5"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:zoom="1.5820312"
+     inkscape:cx="181.0963"
+     inkscape:cy="206.0642"
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg5" />
+  <title
+     id="title1">HTML5 Logo</title>
+  <g
+     id="g5"
+     transform="matrix(1.2153622,0,0,1.2153622,-61.132723,-122.26544)">
+    <path
+       fill="#e44d26"
+       d="M 107.6,471 74.6,100.6 H 437.4 L 404.4,470.8 255.7,512"
+       id="path2" />
+    <path
+       fill="#f16529"
+       d="M 256,480.5 V 131 H 404.3 L 376,447"
+       id="path3" />
+    <path
+       fill="#ebebeb"
+       d="m 142,176.3 h 114 v 45.4 h -64.2 l 4.2,46.5 h 60 v 45.3 H 154.4 m 2,22.8 H 202 l 3.2,36.3 50.8,13.6 v 47.4 l -93.2,-26"
+       id="path4" />
+    <path
+       fill="#ffffff"
+       d="M 369.6,176.3 H 255.8 v 45.4 h 109.6 m -4.1,46.5 H 255.8 v 45.4 h 56 l -5.3,59 -50.7,13.6 v 47.2 l 93,-25.8"
+       id="path5" />
+  </g>
+  <metadata
+     id="metadata5">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:title>HTML5 Logo</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+</svg>
diff --git a/frameworks/termentry/icons/rename-16.png b/frameworks/termentry/icons/rename-16.png
new file mode 100644
index 0000000..2f1d6a7
Binary files /dev/null and b/frameworks/termentry/icons/rename-16.png differ
diff --git a/frameworks/termentry/icons/rename-24.png b/frameworks/termentry/icons/rename-24.png
new file mode 100644
index 0000000..6313ed8
Binary files /dev/null and b/frameworks/termentry/icons/rename-24.png differ
diff --git a/frameworks/termentry/icons/rename.svg b/frameworks/termentry/icons/rename.svg
new file mode 100644
index 0000000..159bd14
--- /dev/null
+++ b/frameworks/termentry/icons/rename.svg
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   version="1.1"
+   id="svg1"
+   width="500"
+   height="500"
+   viewBox="0 0 500 500.00001"
+   sodipodi:docname="rename.svg"
+   inkscape:version="1.3 (0e150ed6c4, 2023-07-21)"
+   inkscape:export-filename="rename-16.png"
+   inkscape:export-xdpi="3.072"
+   inkscape:export-ydpi="3.072"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs1" />
+  <sodipodi:namedview
+     id="namedview1"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:zoom="0.79101563"
+     inkscape:cx="306.5679"
+     inkscape:cy="355.23951"
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="g1" />
+  <g
+     inkscape:groupmode="layer"
+     inkscape:label="Image"
+     id="g1"
+     transform="translate(-135.13465,-32.917571)">
+    <path
+       style="fill:#000000;stroke-width:0.97607"
+       d="m 477.73131,498.22171 c -4.4574,-3.02888 -7.06899,-9.11472 -6.17698,-14.3944 1.14814,-6.79581 8.79931,-12.47302 16.83632,-12.49266 3.30767,-0.008 9.10787,-2.68328 12.29261,-5.66963 5.29215,-4.96252 6.42022,-9.05431 6.44395,-23.37391 l 0.0215,-12.93293 H 345.30026 c -111.25231,0 -163.65894,-0.32823 -167.64006,-1.04995 -19.64426,-3.56128 -36.84616,-20.27451 -40.99036,-39.82591 -2.08729,-9.84741 -2.02749,-202.81473 0.0656,-211.69232 4.58168,-19.43246 21.55466,-35.69133 40.92476,-39.20291 3.98112,-0.72172 56.38775,-1.04996 167.64006,-1.04996 h 161.8484 v -12.72026 c 0,-13.91471 -0.96824,-17.8039 -5.66419,-22.75168 -3.35348,-3.533318 -9.09467,-6.497517 -12.59824,-6.504521 -8.58866,-0.01717 -16.15157,-5.506347 -17.34862,-12.591682 -0.88342,-5.22887 2.12784,-12.033543 6.50656,-14.703157 8.4213,-5.134294 29.21681,-0.239442 39.86931,9.384443 l 3.86223,3.4893 3.38446,-2.971591 c 11.72197,-10.29202 32.42308,-15.237342 40.5532,-9.687816 11.84276,8.08375 7.07805,24.685552 -7.63655,26.608145 -7.5731,0.989493 -12.61946,3.301043 -16.11062,7.379679 -4.52402,5.2853 -5.53544,9.52899 -5.53544,23.22552 v 11.84362 l 25.62184,0.017 c 18.21466,0.012 27.49044,0.41302 32.08538,1.38698 19.20222,4.07019 35.40176,20.26972 39.47194,39.47194 2.05161,9.67908 2.02419,201.5187 -0.0302,211.21359 -4.00983,18.92286 -20.43297,35.29847 -39.44175,39.32766 -4.59495,0.97396 -13.87073,1.37493 -32.08538,1.38699 l -25.62187,0.0169 v 11.84362 c 0,13.69653 1.01142,17.94023 5.53544,23.22552 3.49116,4.07864 8.53752,6.39019 16.11062,7.37969 11.30545,1.47715 17.54192,11.8264 12.66124,21.01096 -2.88218,5.42375 -7.20561,7.79334 -14.21931,7.79334 -10.93671,0 -23.05327,-4.59182 -31.35858,-11.88398 l -3.38446,-2.97159 -3.86223,3.4893 c -11.04396,9.97755 -31.8643,14.62881 -40.18216,8.97667 z M 507.14865,282.94766 V 165.81924 l -162.27167,0.01 -162.27166,0.01 -4.88036,2.30146 c -5.81572,2.74256 -8.46661,5.44142 -11.14278,11.34445 -1.96241,4.32862 -1.99129,5.82915 -1.99129,103.46344 0,97.63429 0.0289,99.13482 1.99129,103.46344 2.67617,5.90302 5.32706,8.60189 11.14278,11.34445 l 4.88036,2.30146 162.27166,0.01 162.27167,0.009 z m -210.53758,95.57662 c -4.2913,-2.12417 -8.10214,-8.00924 -8.10214,-12.51213 0,-1.21734 -0.32942,-2.04398 -0.73205,-1.83699 -15.19982,7.81437 -23.94174,9.95034 -37.82272,9.24147 -26.68195,-1.36261 -48.36544,-17.7761 -57.47039,-43.50267 -2.68482,-7.5861 -2.97723,-9.56092 -2.97979,-20.12437 -0.003,-13.27947 1.408,-19.38183 6.91456,-29.8996 6.5198,-12.45311 16.46474,-22.05708 29.13386,-28.135 10.35202,-4.96631 16.57478,-6.35747 28.30604,-6.32812 10.84293,0.0271 20.4456,2.37492 29.41805,7.19256 l 5.01629,2.69343 0.52463,-3.91138 c 0.99838,-7.44348 7.31646,-12.73322 15.06864,-12.61602 4.75647,0.0719 8.00053,1.91254 11.4045,6.47076 1.97484,2.64449 2.01742,3.82428 2.27813,63.13665 0.25996,59.14026 0.22289,60.52567 -1.72126,64.33653 -2.18278,4.27861 -7.81085,7.8258 -12.41453,7.8245 -1.4977,-4.2e-4 -4.56751,-0.91374 -6.82182,-2.02962 z m -28.0475,-37.48905 c 7.07585,-3.46188 13.12921,-9.57442 16.71682,-16.88025 2.3869,-4.86068 2.7405,-6.71423 2.7405,-14.36539 0,-7.61949 -0.37278,-9.59174 -2.81061,-14.86976 -3.40471,-7.37136 -10.16391,-14.00625 -17.96204,-17.63171 -4.6627,-2.16775 -6.94667,-2.59479 -13.87784,-2.59479 -6.91584,0 -9.21847,0.42864 -13.83594,2.57561 -7.73819,3.598 -13.87507,9.59887 -17.64239,17.25139 -2.82652,5.74149 -3.17216,7.34982 -3.17216,14.7607 0,12.70728 4.73387,22.03464 14.64893,28.8634 7.16612,4.9355 12.20738,6.33337 21.57132,5.98147 6.33462,-0.23805 9.05371,-0.85492 13.62341,-3.09067 z m 81.73136,37.48905 c -2.92675,-1.44872 -4.67109,-3.21118 -6.10044,-6.16381 -1.97139,-4.07237 -2.0017,-5.42602 -2.0017,-89.41281 0,-84.11232 0.0275,-85.33461 2.01081,-89.43162 2.18224,-4.50789 8.00387,-8.1754 12.97729,-8.1754 4.52416,0 10.17958,3.57012 12.32873,7.78281 1.83376,3.59447 1.96527,5.71642 1.96527,31.70915 0,15.32128 0.21302,27.85688 0.47338,27.85688 0.26035,0 2.56631,-1.284 5.12437,-2.85334 22.04691,-13.52559 51.39007,-12.8214 73.66624,1.76789 13.51028,8.84827 23.63889,22.17419 28.89278,38.01346 2.16742,6.53427 2.48189,9.1541 2.47998,20.66013 -0.002,11.63138 -0.30535,14.09285 -2.58672,20.98551 -10.62063,32.08813 -42.26056,52.69609 -74.62593,48.60591 -10.41191,-1.3158 -19.34825,-4.19472 -26.96368,-8.68657 -3.15727,-1.86226 -5.84847,-3.26055 -5.98046,-3.1073 -0.13201,0.15324 -1.19822,2.17837 -2.36938,4.50029 -1.55933,3.0915 -3.22457,4.71888 -6.22042,6.079 -5.27196,2.39349 -8.02719,2.36605 -13.07012,-0.13018 z m 76.81596,-30.07866 c 19.89697,-7.55901 30.69332,-29.76937 24.39034,-50.17605 -10.85825,-35.15493 -59.54596,-39.01944 -75.69679,-6.00833 -11.22726,22.94769 1.24737,50.61634 25.92863,57.50957 7.00436,1.95624 18.29183,1.36683 25.37782,-1.32519 z m 165.4439,49.30993 c 5.81573,-2.74256 8.46661,-5.44142 11.14279,-11.34445 1.9624,-4.32862 1.99129,-5.82915 1.99129,-103.46344 0,-97.63429 -0.0289,-99.13482 -1.99129,-103.46344 -2.67618,-5.90303 -5.32706,-8.60189 -11.14279,-11.34445 -4.73859,-2.23461 -5.62464,-2.30174 -30.5022,-2.311 l -25.62184,-0.01 v 117.12842 117.12842 l 25.62184,-0.01 c 24.87756,-0.009 25.76361,-0.0764 30.5022,-2.31099 z"
+       id="path1" />
+  </g>
+</svg>
diff --git a/frameworks/termentry/icons/replace-16.png b/frameworks/termentry/icons/replace-16.png
new file mode 100644
index 0000000..24743e8
Binary files /dev/null and b/frameworks/termentry/icons/replace-16.png differ
diff --git a/frameworks/termentry/icons/replace-24.png b/frameworks/termentry/icons/replace-24.png
new file mode 100644
index 0000000..31b6fab
Binary files /dev/null and b/frameworks/termentry/icons/replace-24.png differ
diff --git a/frameworks/termentry/icons/replace.svg b/frameworks/termentry/icons/replace.svg
new file mode 100644
index 0000000..210e504
--- /dev/null
+++ b/frameworks/termentry/icons/replace.svg
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="24"
+   height="24"
+   viewBox="0 0 6.3499997 6.3500002"
+   version="1.1"
+   id="svg1"
+   xml:space="preserve"
+   inkscape:version="1.3 (0e150ed6c4, 2023-07-21)"
+   sodipodi:docname="replace.svg"
+   inkscape:export-filename="replace-16.png"
+   inkscape:export-xdpi="64"
+   inkscape:export-ydpi="64"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"><sodipodi:namedview
+     id="namedview1"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:document-units="mm"
+     inkscape:zoom="11.545455"
+     inkscape:cx="1.6023622"
+     inkscape:cy="5.8031496"
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="layer1" /><defs
+     id="defs1" /><g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"><g
+       id="g1"
+       transform="translate(0.52916815,0.72879945)"><path
+         d="M 0.62480211,2.5161683 C 0.57499942,2.1704697 0.80286209,1.8445102 1.1609407,1.749216 1.2232397,1.732637 1.4304074,1.729401 2.4383292,1.729266 L 3.6413591,1.7291112 V 1.973377 c 0,0.1343462 0.00381,0.2541964 0.00847,0.2663333 0.01357,0.035364 0.080427,0.063798 0.1168622,0.049701 C 3.8106633,2.2723991 5.2298675,1.1905393 5.2278387,1.1755769 5.2263835,1.164766 4.8860869,0.90300813 4.0435038,0.26455074 3.9010485,0.15660677 3.775293,0.06704205 3.7640464,0.06551673 3.7203855,0.05959801 3.6948432,0.06702485 3.6686217,0.09323945 3.6433276,0.11853357 3.6413578,0.13868023 3.6413578,0.37212164 v 0.25161747 l -1.1485021,0.004715 C 1.2501358,0.63355513 1.3020279,0.6305971 1.0921606,0.70803202 0.79683621,0.81698167 0.52367379,1.0680909 0.40255732,1.3419598 0.33003493,1.505949 0.30888392,1.6131566 0.31003962,1.810904 c 0.001296,0.220937 0.0288144,0.3398709 0.12145645,0.5248423 0.0536346,0.1070891 0.19140951,0.3034027 0.20405524,0.2907565 0.002461,-0.00246 -0.002355,-0.05212 -0.01075,-0.1103276 z"
+         style="fill:#00af00;fill-opacity:1;stroke:#006300;stroke-width:0.128808;stroke-dasharray:none;stroke-opacity:1"
+         id="path1-0"
+         sodipodi:nodetypes="ssccscscscsscscssssss" /><path
+         d="M 4.6668649,2.3762317 C 4.7166676,2.7219307 4.4888049,3.0478901 4.1307262,3.1431844 4.0684275,3.1597632 3.86126,3.162999 2.8533383,3.163134 L 1.650308,3.1632887 V 2.919023 c 0,-0.1343465 -0.00381,-0.2541967 -0.00847,-0.2663336 -0.01357,-0.035364 -0.080427,-0.063797 -0.1168625,-0.049701 -0.043975,0.017013 -1.46317931,1.0988728 -1.46115049,1.1138355 0.0014552,0.010811 0.34175151,0.2725687 1.18433439,0.9110261 0.1424554,0.107944 0.2682113,0.197509 0.2794577,0.1990341 0.043661,0.00592 0.069203,-0.00151 0.095425,-0.027723 0.025294,-0.025294 0.027264,-0.04544 0.027264,-0.278882 V 4.268661 L 2.7988082,4.263951 C 4.0415311,4.258845 3.989639,4.261803 4.1995061,4.1843681 4.4948305,4.0754184 4.767993,3.8243092 4.8891097,3.5504401 4.9616322,3.3864508 4.9827832,3.2792432 4.9816269,3.0814959 4.9803305,2.8605589 4.9528128,2.7416252 4.8601707,2.5566537 4.8065361,2.4495646 4.6687612,2.2532505 4.6561155,2.265897 c -0.00246,0.00246 0.00235,0.05212 0.01075,0.1103279 z"
+         style="fill:#eaa900;fill-opacity:1;stroke:#d68200;stroke-width:0.128808;stroke-dasharray:none;stroke-opacity:1"
+         id="path1-0-8"
+         sodipodi:nodetypes="ssccscscscsscscssssss" /></g></g></svg>