diff --git a/Products/zms/plugins/www/zmi.core.css b/Products/zms/plugins/www/zmi.core.css
index c57a97057..3b76156c6 100644
--- a/Products/zms/plugins/www/zmi.core.css
+++ b/Products/zms/plugins/www/zmi.core.css
@@ -520,9 +520,6 @@ footer .back-to-top.hide {
 	margin-top: -2px;
 	display: inline-block;
 }
-.btn-group.managing, .btn-group.packaging {
-	margin-right:0.2rem;
-}
 .center h1 {
 	line-height:1.4em;
 	font-size:x-large;
diff --git a/Products/zms/plugins/www/zmi.core.scss b/Products/zms/plugins/www/zmi.core.scss
index f56e012ea..916dc303a 100644
--- a/Products/zms/plugins/www/zmi.core.scss
+++ b/Products/zms/plugins/www/zmi.core.scss
@@ -84,10 +84,6 @@ nav .nav-tabs .nav-link.active {
 	opacity:0.5;
 }
 
-.btn-group.managing, .btn-group.packaging {
-	margin-right:0.2em;
-}
-
 .center h1 {
 	line-height:1.4em;
 	font-size:x-large;
diff --git a/Products/zms/zpt/ZMS/manage_users.zpt b/Products/zms/zpt/ZMS/manage_users.zpt
index 16f4ccbe9..75be79311 100644
--- a/Products/zms/zpt/ZMS/manage_users.zpt
+++ b/Products/zms/zpt/ZMS/manage_users.zpt
@@ -40,7 +40,7 @@
 							tal:define="name python:search_param[0]; label python:search_param[1]"
 							tal:attributes="value name; selected python:['','selected'][request.get('search_param',here.getConfProperty('LDAPUserFolder.uid_attr',''))==name]"
 							tal:content="python:label">
-								the search-param
+							the search-param
 						</option>
 					</tal:block>
 				</select>
@@ -58,11 +58,11 @@
 					res valid_userids/records;
 					dummy0 python:[here.operator_setitem(x,'__id__',x['name']) for x in res]"
 				><tal:block tal:content="structure python:here.metaobj_recordset_main_grid(
-						metaObjAttrIds=metaObjAttrIds,
-						metaObjAttrs=metaObjAttrs,
-						records=res,
-						actions=['select']+[[],['insert']][int(userAdderPlugin is not None)],
-						insert='zmiModalAddUserOpen();')">
+					metaObjAttrIds=metaObjAttrIds,
+					metaObjAttrs=metaObjAttrs,
+					records=res,
+					actions=['select']+[[],['insert']][int(userAdderPlugin is not None)],
+					insert='zmiModalAddUserOpen();')">
 					metaobj_recordset_main_grid
 				</tal:block
 			></tal:block>
@@ -96,28 +96,28 @@ function zmiModalInsertUserLoad(url) {
 		}
 	}
 	$("input:text").each(function() {
-			data[$(this).attr("name")] = $(this).val();
+		data[$(this).attr("name")] = $(this).val();
 		});
 	$("select option:selected").each(function() {
-			data[$(this).parent().attr("name")] = $(this).val();
+		data[$(this).parent().attr("name")] = $(this).val();
 		});
 	$('#zmiModalinsertUser .modal-body').html('<i class="fas fa-spinner fa-spin"></i>' +getZMILangStr('MSG_LOADING'));
 	$.get(self.location.href,data,function(result) {
 			$('#zmiModalinsertUser .modal-body').html(result);
 			$("#zmiModalinsertUser #insertUserForm .btn-group")
 				.mouseover( function(evt) {
-						$(this).parents(".ZMSRecordSet.main_grid").css({overflow:"visible"});
+					$(this).parents(".ZMSRecordSet.main_grid").css({overflow:"visible"});
 				});
 			$("#zmiModalinsertUser #insertUserForm input:radio").change(function() {
-					self.location.href = zmiParams['base_url']
-						+'?lang='+getZMILang()
-						+'&id='+$(this).prop("value");
+				self.location.href = zmiParams['base_url']
+					+'?lang='+getZMILang()
+					+'&id='+$(this).prop("value");
 				});
 			$("#zmiModalinsertUser #insertUserForm a").each(function() {
-					var href = $(this).attr("href");
-					$(this)
-						.click(function() {return zmiModalInsertUserLoad(href);})
-						.attr("href","javascript:;");
+				var href = $(this).attr("href");
+				$(this)
+					.click(function() {return zmiModalInsertUserLoad(href);})
+					.attr("href","javascript:;");
 				});
 		});
 	return false;
@@ -130,13 +130,13 @@ function zmiModalInsertUserOpen(context) {
 </script>
 
 <tal:block tal:define="
-		userFolder python:here.getUserFolder();
-		userAdderPlugin python:here.getUserAdderPlugin();
-		userDefs python:here.getSecurityUsers(request.get('show_acquired',False));
-		roleDefs python:here.getSecurityRoles();
-		userNames python:here.sort_list(list(userDefs));
-		langs_optpl python:[[x,here.getLanguageLabel(x)] for x in here.getLanguages(request)];
-		roles_optpl python:[(x,here.getRoleName(x)) for x in ['ZMSAdministrator','ZMSEditor','ZMSAuthor','ZMSSubscriber','ZMSUserAdministrator']+list(roleDefs)]">
+	userFolder python:here.getUserFolder();
+	userAdderPlugin python:here.getUserAdderPlugin();
+	userDefs python:here.getSecurityUsers(request.get('show_acquired',False));
+	roleDefs python:here.getSecurityRoles();
+	userNames python:here.sort_list(list(userDefs));
+	langs_optpl python:[[x,here.getLanguageLabel(x)] for x in here.getLanguages(request)];
+	roles_optpl python:[(x,here.getRoleName(x)) for x in ['ZMSAdministrator','ZMSEditor','ZMSAuthor','ZMSSubscriber','ZMSUserAdministrator']+list(roleDefs)]">
 
 <div class="d-none">
 	<div id="importUsers" class="inner">
@@ -161,10 +161,10 @@ function zmiModalInsertUserOpen(context) {
 </div><!-- .d-none -->
 
 <tal:block tal:condition="python:request.get('id',False) not in [False,'']"
-		tal:define="editUser python:request.get('id') not in here.getRootElement().getSecurityRoles();
-		editRole python:not editUser;
-		action python: editUser and 'manage_userProperties' or 'manage_roleProperties';
-		multilang python:editUser and len(here.getLangIds())>1">
+	tal:define="editUser python:request.get('id') not in here.getRootElement().getSecurityRoles();
+	editRole python:not editUser;
+	action python: editUser and 'manage_userProperties' or 'manage_roleProperties';
+	multilang python:editUser and len(here.getLangIds())>1">
 
 <div class="d-none">
 	<div id="insertNode" class="inner">
@@ -302,17 +302,17 @@ function zmiModalInsertUserOpen(context) {
 			<div class="card-body">
 				<div class="form-group row">
 					<div class="controls save"
-							tal:define="
-								security_roles python:here.getRootElement().getSecurityRoles().get(request['id'],{});
-								nodes python:list(security_roles.get('nodes',{}));
-								security_users python:here.getConfProperty('ZMS.security.users',{}).values();
-								is_deletable python:len(list(nodes))==0 and not len([x for x in security_users if len([y for y in x.get('nodes',{}).values() if request['id'] in y['roles']])>0])>0">
-							<button type="submit" name="btn" class="btn btn-danger" value="BTN_DELETE"
-								tal:attributes="
-								disabled python:'' if is_deletable else 'disabled';
-								title python:'' if is_deletable else 'HINT Role cannot be deleted, because it is still in use: containing declared nodes and/or given to users'"
-							><i class="fas fa-times"></i> <tal:block tal:content="python:here.getZMILangStr('BTN_DELETE')">Delete</tal:block></button>
-							&nbsp;&nbsp;
+						tal:define="
+							security_roles python:here.getRootElement().getSecurityRoles().get(request['id'],{});
+							nodes python:list(security_roles.get('nodes',{}));
+							security_users python:here.getConfProperty('ZMS.security.users',{}).values();
+							is_deletable python:len(list(nodes))==0 and not len([x for x in security_users if len([y for y in x.get('nodes',{}).values() if request['id'] in y['roles']])>0])>0">
+						<button type="submit" name="btn" class="btn btn-danger" value="BTN_DELETE"
+							tal:attributes="
+							disabled python:'' if is_deletable else 'disabled';
+							title python:'' if is_deletable else 'HINT Role cannot be deleted, because it is still in use: containing declared nodes and/or given to users'"
+						><i class="fas fa-times"></i> <tal:block tal:content="python:here.getZMILangStr('BTN_DELETE')">Delete</tal:block></button>
+						&nbsp;&nbsp;
 						<button type="submit" name="btn" class="btn btn-secondary" value="BTN_BACK" tal:content="python:here.getZMILangStr('BTN_BACK')">Back</button>
 					</div>
 				</div>
@@ -340,22 +340,22 @@ function zmiModalInsertUserOpen(context) {
 						</span>
 						<button class="btn btn-secondary dropdown-toggle" data-toggle="dropdown"></button>
 						<div class="dropdown-menu">
-								<a class="dropdown-item" href="javascript:;"
-									onclick="zmiModal('#insertNode',{title:$(this).attr('title')});"
-									tal:attributes="title python:here.getZMILangStr('BTN_INSERT')"
-									><i class="fas fa-plus"></i>
-									<tal:block tal:content="python:here.getZMILangStr('BTN_INSERT')">Insert</tal:block>
-								</a>
-								<a class="dropdown-item" href="javascript:;"
-									onclick="var $f=$(this).closest('form');$('input[name=btn]',$f).attr('value','BTN_DELETE');$f.submit();"
-									><i class="fas fa-times"></i>
-									<tal:block tal:content="python:here.getZMILangStr('BTN_DELETE')">Delete</tal:block>
-								</a>
-								<a class="dropdown-item" href="javascript:;"
-									onclick="var $f=$(this).closest('form');$('input[name=btn]',$f).attr('value','BTN_INVITE');$f.submit();"
-									><i class="fas fa-share"></i>
-									<tal:block tal:content="python:here.getZMILangStr('BTN_INVITE')">Invite</tal:block>
-								</a>
+							<a class="dropdown-item" href="javascript:;"
+								onclick="zmiModal('#insertNode',{title:$(this).attr('title')});"
+								tal:attributes="title python:here.getZMILangStr('BTN_INSERT')"
+								><i class="fas fa-plus"></i>
+								<tal:block tal:content="python:here.getZMILangStr('BTN_INSERT')">Insert</tal:block>
+							</a>
+							<a class="dropdown-item" href="javascript:;"
+								onclick="var $f=$(this).closest('form');$('input[name=btn]',$f).attr('value','BTN_DELETE');$f.submit();"
+								><i class="fas fa-times"></i>
+								<tal:block tal:content="python:here.getZMILangStr('BTN_DELETE')">Delete</tal:block>
+							</a>
+							<a class="dropdown-item" href="javascript:;"
+								onclick="var $f=$(this).closest('form');$('input[name=btn]',$f).attr('value','BTN_INVITE');$f.submit();"
+								><i class="fas fa-share"></i>
+								<tal:block tal:content="python:here.getZMILangStr('BTN_INVITE')">Invite</tal:block>
+							</a>
 						</div><!-- .dropdown-menu -->
 					</div>
 				</th>
@@ -372,14 +372,14 @@ function zmiModalInsertUserOpen(context) {
 						</span>
 						<button class="btn btn-secondary dropdown-toggle" data-toggle="dropdown"></button>
 						<div class="dropdown-menu">
-								<a class="dropdown-item" href="javascript:;" onclick="var $f=$(this).closest('form');$('input[name=btn]',$f).attr('value','BTN_DELETE');$('input:checkbox',$(this).closest('tr')).prop('checked','checked');$f.submit();">
-									<i class="fas fa-times"></i>
-									<tal:block tal:content="python:here.getZMILangStr('BTN_DELETE')">Delete</tal:block>
-								</a>
-								<a class="dropdown-item" href="javascript:;" onclick="var $f=$(this).closest('form');$('input[name=btn]',$f).attr('value','BTN_INVITE');$('input:checkbox',$(this).closest('tr')).prop('checked','checked');$f.submit();"
-									><i class="fas fa-share"></i>
-									<tal:block tal:content="python:here.getZMILangStr('BTN_INVITE')">Invite</tal:block>
-								</a>
+							<a class="dropdown-item" href="javascript:;" onclick="var $f=$(this).closest('form');$('input[name=btn]',$f).attr('value','BTN_DELETE');$('input:checkbox',$(this).closest('tr')).prop('checked','checked');$f.submit();">
+								<i class="fas fa-times"></i>
+								<tal:block tal:content="python:here.getZMILangStr('BTN_DELETE')">Delete</tal:block>
+							</a>
+							<a class="dropdown-item" href="javascript:;" onclick="var $f=$(this).closest('form');$('input[name=btn]',$f).attr('value','BTN_INVITE');$('input:checkbox',$(this).closest('tr')).prop('checked','checked');$f.submit();"
+								><i class="fas fa-share"></i>
+								<tal:block tal:content="python:here.getZMILangStr('BTN_INVITE')">Invite</tal:block>
+							</a>
 						</div><!-- .dropdown-menu -->
 					</div><!-- .btn-group -->
 				</td>
@@ -471,18 +471,22 @@ function zmiModalInsertUserOpen(context) {
 	<thead>
 		<tr>
 			<th>
-				<div class="btn-group">
-					<a class="btn btn-secondary btn-users_add" href="javascript:;" onclick="zmiModalInsertUserOpen(this)" tal:attributes="title python:'%s %s / %s '%(here.getZMILangStr('ATTR_USERS'), here.getZMILangStr('BTN_SEARCH'), here.getZMILangStr('BTN_INSERT'))"><i class="fas fa-plus"></i></a>
+				<div class="btn-group managing mr-1">
+					<button type="button" class="btn btn-secondary btn-users_add" onclick="zmiModalInsertUserOpen(this)" tal:attributes="title python:'%s %s / %s '%(here.getZMILangStr('ATTR_USERS'), here.getZMILangStr('BTN_SEARCH'), here.getZMILangStr('BTN_INSERT'))"><i class="fas fa-plus"></i></button>
+					<button type="button" class="btn btn-secondary btn-users_delete" onclick="zmiDeleteObjBtnClick(this,{btn:'BTN_DELETE',key:'obj'})" title="Delete Selected User Profiles"><i class="fas fa-times"></i></button>
+				</div>
+				<div class="btn-group maintainance mr-1">
 					<a class="btn btn-secondary btn-users_acquired" tal:attributes="href python:'?lang=%s&show_acquired:boolean=%s'%(request['lang'],str(not request.get('show_acquired',False))); title python:'show acquired'; class python:'btn '+['btn-secondary','btn-success'][request.get('show_acquired')==True]" tal:condition="python:here.getPortalMaster() is not None"><i class="fas fa-share"></i></a>
 					<a class="btn btn-secondary btn-users_sitemap" tal:attributes="href python:'manage_users_sitemap?lang=%s'%request['lang']; title python:here.getZMILangStr('TAB_SITEMAP')"><i class="fas fa-sitemap"></i></a>
-					<a class="btn btn-secondary btn-users_import" href="javascript:;" onclick="zmiModal('#importUsers',{title:$(this).attr('title')})" tal:attributes="title python:'%s...'%here.getZMILangStr('BTN_IMPORT')"><i class="fas fa-upload"></i></a>
-					<a class="btn btn-secondary btn-users_export" href="javascript:;" onclick="var $fm=$(this).closest('form');$('input[name=btn]',$fm).val('BTN_EXPORT');$fm.attr('target','_blank').submit();" tal:attributes="title python:here.getZMILangStr('BTN_EXPORT')"><i class="fas fa-download"></i></a>
-					<a class="btn btn-secondary btn-users_filtered" tal:attributes="href python:'?lang=%s&show_filter:boolean=%s'%(request['lang'],str(not request.get('show_filter',False))); class python:'btn '+['btn-secondary','btn-danger'][request.get('show_filter')==True]" title="Filter Undetermined User Profiles"><i class="fas fa-filter"></i></a>
-					<a class="btn btn-secondary btn-users_delete" href="javascript:;" onclick="zmiDeleteObjBtnClick(this,{btn:'BTN_DELETE',key:'obj'})" title="Delete Selected User Profiles"><i class="fas fa-times"></i></a>
+					<a class="btn btn-secondary btn-users_filtered" tal:attributes="href python:'?lang=%s&show_filter:boolean=%s'%(request['lang'],str(not request.get('show_filter',False))); class python:'btn '+['btn-secondary','btn-success'][request.get('show_filter')==True]" title="Filter Undetermined User Profiles"><i class="fas fa-filter"></i></a>
 					<a class="btn btn-secondary btn-users_purge alert-danger" tal:condition="python:request['AUTHENTICATED_USER'].has_role('Manager')" tal:attributes="href python:'?lang=%s&btn=Purge'%request['lang']" title="Purge Local Roles (WARNING: Using this function deletes the local roles of users who no longer exist. Click only if you are aware of the consequences.)"><i class="fas fa-eraser"></i></a>
-					<a class="btn btn-secondary btn-users_lastlogin" href="javascript:;" onclick="$(this).closest('table').toggleClass('show_lastlogin')" title="Last Logins"><i class="far fa-clock"></i></a>
-					<a class="btn btn-secondary btn-users_sync" href="javascript:;" onclick="zmiSynchronizeUsers(this)" tal:attributes="title python:'%s %s'%(here.getZMILangStr('ATTR_USERS'), here.getZMILangStr('BTN_SYNCHRONIZE'))"><i class="fas fa-sync"></i></a>
-				</div><!-- .btn-group -->
+					<button type="button" class="btn btn-secondary btn-users_sync" onclick="zmiSynchronizeUsers(this)" tal:attributes="title python:'%s %s'%(here.getZMILangStr('ATTR_USERS'), here.getZMILangStr('BTN_SYNCHRONIZE'))"><i class="fas fa-sync"></i></button>
+					<button type="button" class="btn btn-secondary btn-users_lastlogin" onclick="$(this).closest('table').toggleClass('show_lastlogin')" title="Last Logins"><i class="far fa-clock"></i></button>
+				</div>
+				<div class="btn-group managing mr-1">
+					<button type="button" class="btn btn-secondary btn-users_import" onclick="zmiModal('#importUsers',{title:$(this).attr('title')})" tal:attributes="title python:'%s...'%here.getZMILangStr('BTN_IMPORT')"><i class="fas fa-upload"></i></button>
+					<button type="button" class="btn btn-secondary btn-users_export" onclick="var $fm=$(this).closest('form');$('input[name=btn]',$fm).val('BTN_EXPORT');$fm.attr('target','_blank').submit();" tal:attributes="title python:here.getZMILangStr('BTN_EXPORT')"><i class="fas fa-download"></i></button>
+				</div>
 			</th>
 		</tr>
 	</thead>
@@ -491,14 +495,14 @@ function zmiModalInsertUserOpen(context) {
 		userNames python:[x for x in userNames if not securityUsers[x].get('nodes',{})] if request.get('show_filter',False) else userNames;">		
 	<tr tal:repeat="userName userNames" tal:attributes="id userName" class="userName">
 		<td tal:define="
-				securityUser python:securityUsers.get(userName,{});
-				label python:securityUser.get('label',securityUser.get('details',{}).get('label',None));
-				lower python:securityUser.get('attrActiveStart',None);
-				upper python:securityUser.get('attrActiveEnd',None);
-				active python:standard.todayInRange(lower, upper);
-				acquired python:securityUser.get('acquired',False);
-				lastlogin python:securityUser.get('lastlogin',None);
-				nodes python:securityUser.get('nodes',{});"
+			securityUser python:securityUsers.get(userName,{});
+			label python:securityUser.get('label',securityUser.get('details',{}).get('label',None));
+			lower python:securityUser.get('attrActiveStart',None);
+			upper python:securityUser.get('attrActiveEnd',None);
+			active python:standard.todayInRange(lower, upper);
+			acquired python:securityUser.get('acquired',False);
+			lastlogin python:securityUser.get('lastlogin',None);
+			nodes python:securityUser.get('nodes',{});"
 			tal:attributes="data-lastlogin lastlogin">
 			<tal:block tal:content="repeat/userName/number"></tal:block>.
 			<input type="checkbox" name="ids:list" tal:attributes="value userName"/>
diff --git a/Products/zms/zpt/ZMSFormatProvider/manage_charformats.zpt b/Products/zms/zpt/ZMSFormatProvider/manage_charformats.zpt
index fb49247c0..2b562d4a3 100644
--- a/Products/zms/zpt/ZMSFormatProvider/manage_charformats.zpt
+++ b/Products/zms/zpt/ZMSFormatProvider/manage_charformats.zpt
@@ -72,7 +72,7 @@
 			</div><!-- .form-group -->
 			<div class="form-group row">
 				<label for="_icon_clazz" class="col-sm-2 control-label mandatory"><span>Icon</span></label>
-				<div class="col-sm-9"><input type="text" id="_icon_clazz" name="_icon_clazz" class="form-control form-control-sm zmi-input-icon-clazz""/></div>
+				<div class="col-sm-10"><input type="text" id="_icon_clazz" name="_icon_clazz" class="form-control form-control-sm zmi-input-icon-clazz" placeholder="fas fa-bold" value="fas fa-bold"/></div>
 			</div><!-- .form-group -->
 			<div class="form-group row">
 				<label for="_display" class="col-sm-2 control-label mandatory"><span tal:content="python:here.getZMILangStr('ATTR_DISPLAY')">Display</span></label>
@@ -130,11 +130,13 @@
 				</div>
 			</th>
 			<th>
-				<div class="btn-group">
-					<button class="btn btn-primary" tal:attributes="title python:here.getZMILangStr('BTN_INSERT')+'...'" onclick="zmiModal('#insertObj',{title:$(this).attr('title')});return false"><i class="fas fa-plus"></i></button>
-					<button class="btn btn-secondary" tal:attributes="title python:here.getZMILangStr('BTN_DELETE')+'...'" onclick="zmiDeleteObjBtnClick(this,{btn:'BTN_DELETE',key:'obj'});return false"><i class="fas fa-times"></i></button>
-					<button class="btn btn-secondary" tal:attributes="title python:here.getZMILangStr('BTN_IMPORT')+'...'" onclick="zmiModal($('#importConf'),{title:$(this).attr('title')});return false"><i class="fas fa-upload"></i></button>
-					<button class="btn btn-secondary" tal:attributes="title python:here.getZMILangStr('BTN_EXPORT')+'...'" onclick="zmiExportBtnClick(this);return false"><i class="fas fa-download"></i></button>
+				<div class="btn-group managing mr-1">
+					<button type="button" class="btn btn-primary" tal:attributes="title python:here.getZMILangStr('BTN_INSERT')+'...'" onclick="zmiModal('#insertObj',{title:$(this).attr('title')});return false"><i class="fas fa-plus"></i></button>
+					<button type="button" class="btn btn-secondary" tal:attributes="title python:here.getZMILangStr('BTN_DELETE')+'...'" onclick="zmiDeleteObjBtnClick(this,{btn:'BTN_DELETE',key:'obj'});return false"><i class="fas fa-times"></i></button>
+				</div>
+				<div class="btn-group managing mr-1">
+					<button type="button" class="btn btn-secondary" tal:attributes="title python:here.getZMILangStr('BTN_IMPORT')+'...'" onclick="zmiModal($('#importConf'),{title:$(this).attr('title')});return false"><i class="fas fa-upload"></i></button>
+					<button type="button" class="btn btn-secondary" tal:attributes="title python:here.getZMILangStr('BTN_EXPORT')+'...'" onclick="zmiExportBtnClick(this);return false"><i class="fas fa-download"></i></button>
 				</div>
 			</th>
 		</tr>
diff --git a/Products/zms/zpt/ZMSFormatProvider/manage_textformats.zpt b/Products/zms/zpt/ZMSFormatProvider/manage_textformats.zpt
index 9e6e26545..291578c28 100644
--- a/Products/zms/zpt/ZMSFormatProvider/manage_textformats.zpt
+++ b/Products/zms/zpt/ZMSFormatProvider/manage_textformats.zpt
@@ -136,11 +136,13 @@
 				</div>
 			</th>
 			<th colspan="2">
-				<div class="btn-group">
-					<button class="btn btn-primary" tal:attributes="title python:here.getZMILangStr('BTN_INSERT')+'...'" onclick="zmiModal('#insertObj',{title:$(this).attr('title')});return false"><i class="fas fa-plus"></i></button>
-					<button class="btn btn-secondary" tal:attributes="title python:here.getZMILangStr('BTN_DELETE')+'...'" onclick="zmiDeleteObjBtnClick(this,{btn:'BTN_DELETE',key:'obj'});return false"><i class="fas fa-times"></i></button>
-					<button class="btn btn-secondary" tal:attributes="title python:here.getZMILangStr('BTN_IMPORT')+'...'" onclick="zmiModal('#importConf',{title:$(this).attr('title')});return false"><i class="fas fa-upload"></i></button>
-					<button class="btn btn-secondary" tal:attributes="title python:here.getZMILangStr('BTN_EXPORT')+'...'" onclick="zmiExportBtnClick(this);return false"><i class="fas fa-download"></i></button>
+				<div class="btn-group managing mr-1">
+					<button type="button" class="btn btn-primary" tal:attributes="title python:here.getZMILangStr('BTN_INSERT')+'...'" onclick="zmiModal('#insertObj',{title:$(this).attr('title')});return false"><i class="fas fa-plus"></i></button>
+					<button type="button" class="btn btn-secondary" tal:attributes="title python:here.getZMILangStr('BTN_DELETE')+'...'" onclick="zmiDeleteObjBtnClick(this,{btn:'BTN_DELETE',key:'obj'});return false"><i class="fas fa-times"></i></button>
+				</div>
+				<div class="btn-group managing mr-1">
+					<button type="button" class="btn btn-secondary" tal:attributes="title python:here.getZMILangStr('BTN_IMPORT')+'...'" onclick="zmiModal('#importConf',{title:$(this).attr('title')});return false"><i class="fas fa-upload"></i></button>
+					<button type="button" class="btn btn-secondary" tal:attributes="title python:here.getZMILangStr('BTN_EXPORT')+'...'" onclick="zmiExportBtnClick(this);return false"><i class="fas fa-download"></i></button>
 				</div>
 			</th>
 		</tr>
diff --git a/Products/zms/zpt/ZMSMetacmdProvider/manage_main.zpt b/Products/zms/zpt/ZMSMetacmdProvider/manage_main.zpt
index 9b91b8ddb..93037fd6d 100644
--- a/Products/zms/zpt/ZMSMetacmdProvider/manage_main.zpt
+++ b/Products/zms/zpt/ZMSMetacmdProvider/manage_main.zpt
@@ -247,17 +247,15 @@
 				</div>
 			</th>
 			<th colspan="5" class="w-100">
-				<div class="btn-toolbar" role="toolbar">
-					<div class="btn-group managing">
-						<button class="btn btn-primary" tal:attributes="title python:here.getZMILangStr('BTN_INSERT')+'...'" onclick="zmiModal('#insertObj',{title:$(this).attr('title')});return false"><i class="fas fa-plus"></i></button>
-						<button class="btn btn-secondary" tal:attributes="title python:here.getZMILangStr('BTN_DELETE')+'...'" onclick="zmiDeleteObjBtnClick(this,{btn:'BTN_DELETE',key:'obj'});return false"><i class="fas fa-times"></i></button>
-					</div><!-- .btn-group -->
-					<div class="btn-group packaging">
-						<button class="btn btn-secondary" tal:attributes="title python:here.getZMILangStr('BTN_ACQUIRE')+'...'" onclick="$ZMI.iframe('manage_main_acquire',{lang:getZMILang()},{iframe:true,height:'600',title:$(this).attr('title')});return false" tal:condition="python:here.getPortalMaster() is not None"><i class="fas fa-share"></i></button>
-						<button class="btn btn-secondary" tal:attributes="title python:here.getZMILangStr('BTN_IMPORT')+'...'" onclick="zmiModal('#importConf',{title:$(this).attr('title')});return false"><i class="fas fa-upload"></i></button>
-						<button class="btn btn-secondary" tal:attributes="title python:here.getZMILangStr('BTN_EXPORT')+'...'" onclick="zmiExportBtnClick(this);return false"><i class="fas fa-download"></i></button>
-					</div><!-- .btn-group -->
-				</div><!-- .btn-toolbar -->
+				<div class="btn-group managing mr-1">
+					<button type="button" class="btn btn-primary" tal:attributes="title python:here.getZMILangStr('BTN_INSERT')+'...'" onclick="zmiModal('#insertObj',{title:$(this).attr('title')});return false"><i class="fas fa-plus"></i></button>
+					<button type="button" class="btn btn-secondary" tal:attributes="title python:here.getZMILangStr('BTN_DELETE')+'...'" onclick="zmiDeleteObjBtnClick(this,{btn:'BTN_DELETE',key:'obj'});return false"><i class="fas fa-times"></i></button>
+				</div><!-- .btn-group -->
+				<div class="btn-group managing mr-1">
+					<button type="button" class="btn btn-secondary" tal:attributes="title python:here.getZMILangStr('BTN_ACQUIRE')+'...'" onclick="$ZMI.iframe('manage_main_acquire',{lang:getZMILang()},{iframe:true,height:'600',title:$(this).attr('title')});return false" tal:condition="python:here.getPortalMaster() is not None"><i class="fas fa-share"></i></button>
+					<button type="button" class="btn btn-secondary" tal:attributes="title python:here.getZMILangStr('BTN_IMPORT')+'...'" onclick="zmiModal('#importConf',{title:$(this).attr('title')});return false"><i class="fas fa-upload"></i></button>
+					<button type="button" class="btn btn-secondary" tal:attributes="title python:here.getZMILangStr('BTN_EXPORT')+'...'" onclick="zmiExportBtnClick(this);return false"><i class="fas fa-download"></i></button>
+				</div><!-- .btn-group -->
 			</th>
 		</tr>
 		<tr>
diff --git a/Products/zms/zpt/ZMSMetamodelProvider/manage_main.zpt b/Products/zms/zpt/ZMSMetamodelProvider/manage_main.zpt
index 1d947e936..dbea3908b 100644
--- a/Products/zms/zpt/ZMSMetamodelProvider/manage_main.zpt
+++ b/Products/zms/zpt/ZMSMetamodelProvider/manage_main.zpt
@@ -516,21 +516,19 @@
 				</div>
 			</th>
 			<th colspan="2" class="meta-toolbar">
-				<div class="btn-toolbar" role="toolbar">
-					<div class="btn-group managing">
-						<button class="btn btn-primary" tal:attributes="title python:here.getZMILangStr('BTN_INSERT')+'...'" onclick="zmiModal('#insertObj',{title:$(this).attr('title')});return false"><i class="fas fa-plus"></i></button>
-						<button class="btn btn-secondary" tal:attributes="title python:here.getZMILangStr('BTN_DELETE')+'...'" onclick="zmiDeleteObjBtnClick(this,{btn:'BTN_DELETE',key:'obj'});return false"><i class="fas fa-times"></i></button>
-					</div><!-- .btn-group -->
-					<div class="btn-group packaging">
-						<button class="btn btn-secondary" tal:attributes="title python:here.getZMILangStr('BTN_ACQUIRE')+'...'" onclick="$ZMI.iframe('manage_main_acquire',{lang:getZMILang()},{iframe:true,height:'600',title:$(this).attr('title')});return false" tal:condition="python:here.getPortalMaster() is not None"><i class="fas fa-share"></i></button>
-						<button class="btn btn-secondary" tal:attributes="title python:here.getZMILangStr('BTN_IMPORT')+'...'" onclick="$ZMI.iframe('manage_main_import',{lang:getZMILang()},{iframe:true,height:'600',title:$(this).attr('title')});return false"><i class="fas fa-upload"></i></button>
-						<button class="btn btn-secondary" tal:attributes="title python:here.getZMILangStr('BTN_EXPORT')+'...'" onclick="return zmiExportBtnClick(this);"><i class="fas fa-download"></i></button>
-					</div><!-- .btn-group -->
-					<span class="btn-group">
-						<i class="fas fa-filter tablefilter p-2" onclick="$('#tablefilter').focus().addClass('visited')"></i>
-						<input id="tablefilter" name="tablefilter" class="form-control" type="text"  title="Filter object list by entering a name." />
-					</span>	
-				</div><!-- .btn-toolbar -->
+				<div class="btn-group managing mr-1">
+					<button type="button" class="btn btn-primary" tal:attributes="title python:here.getZMILangStr('BTN_INSERT')+'...'" onclick="zmiModal('#insertObj',{title:$(this).attr('title')});return false"><i class="fas fa-plus"></i></button>
+					<button type="button" class="btn btn-secondary" tal:attributes="title python:here.getZMILangStr('BTN_DELETE')+'...'" onclick="zmiDeleteObjBtnClick(this,{btn:'BTN_DELETE',key:'obj'});return false"><i class="fas fa-times"></i></button>
+				</div><!-- .btn-group -->
+				<div class="btn-group managing mr-1">
+					<button type="button" class="btn btn-secondary" tal:attributes="title python:here.getZMILangStr('BTN_ACQUIRE')+'...'" onclick="$ZMI.iframe('manage_main_acquire',{lang:getZMILang()},{iframe:true,height:'600',title:$(this).attr('title')});return false" tal:condition="python:here.getPortalMaster() is not None"><i class="fas fa-share"></i></button>
+					<button type="button" class="btn btn-secondary" tal:attributes="title python:here.getZMILangStr('BTN_IMPORT')+'...'" onclick="$ZMI.iframe('manage_main_import',{lang:getZMILang()},{iframe:true,height:'600',title:$(this).attr('title')});return false"><i class="fas fa-upload"></i></button>
+					<button type="button" class="btn btn-secondary" tal:attributes="title python:here.getZMILangStr('BTN_EXPORT')+'...'" onclick="return zmiExportBtnClick(this);"><i class="fas fa-download"></i></button>
+				</div><!-- .btn-group -->
+				<div class="btn-group filtering">
+					<i class="fas fa-filter tablefilter p-2" onclick="$('#tablefilter').focus().addClass('visited')"></i>
+					<input id="tablefilter" name="tablefilter" class="form-control" type="text"  title="Filter object list by entering a name." />
+				</div>	
 			</th>
 		</tr>
 	</thead>
@@ -1058,7 +1056,7 @@
 		transition: width 0.5s ease-in-out;
 	}
 	.zmi .fa-filter.tablefilter {
-		margin: 0.1rem -2.25rem 0 1.25rem;
+		margin: 0.1rem -2.25rem 0 0.25rem;
 		opacity:.3;
 		cursor:pointer;
 	}