diff --git a/css/window.css b/css/window.css
index 8b309c262..aebd97f25 100644
--- a/css/window.css
+++ b/css/window.css
@@ -401,7 +401,7 @@
 		width: 68px;
 		flex-shrink: 0;
 	}
-	#settings_profiles_header_menu {
+	body:not(.is_mobile) #settings_profiles_header_menu {
 		width: 24px;
 		text-align: center;
 		padding-top: 2px;
@@ -586,19 +586,19 @@
 	li.menu_bar_point.highlighted {
 		animation: menu_item_highlight 1s infinite ease-in-out;
 	}
-	header .tool {
+	body.is_mobile header .tool {
 		height: 100%;
 		width: 42px;
 	}
-	header .tool > .icon {
+	body.is_mobile header .tool > .icon {
 		margin-top: 7px;
 	}
+	body:not(.is_mobile) header .tool > .icon {
+		margin-top: 2px;
+	}
 	header .tool.hidden {
 		display: none;
 	}
-	body.is_mobile.is_landscape #title_bar_undo_controls {
-		display: block;
-	}
 
 	#mode_selector {
 		height: 30px;
@@ -625,6 +625,42 @@
 		margin-top: 3px;
 	}
 
+	#mobile_menu_bar {
+		position: absolute;
+		margin: auto;
+		top: 50px;
+		left: 0;
+		right: 0;
+		width: fit-content;
+		max-width: 100%;
+		display: flex;
+		flex-wrap: wrap;
+		justify-content: space-around;
+		background-color: var(--color-bright_ui);
+		box-shadow: 0 0px 8px rgba(0, 0, 0, 0.64);
+		border-radius: 4px;
+		padding: 0 5px;
+		z-index: 30;
+	}
+	#mobile_menu_bar > .tool {
+		color: var(--color-bright_ui_text);
+		width: 42px;
+		height: 36px;
+		padding-top: 3px;
+	}
+	#mobile_menu_bar > .tool.selected {
+		background-color: var(--color-accent);
+		color: var(--color-accent_text);
+	}
+	#mobile_menu_bar > label {
+		height: 20px;
+		width: 0;
+		flex-basis: 100%;
+		text-align: center;
+		color: var(--color-bright_ui_text);
+		opacity: 0.8;
+	}
+
 /* Tab Bar */
 	#tab_bar {
 		display: flex;
diff --git a/index.html b/index.html
index 89b188d16..bb688fde3 100644
--- a/index.html
+++ b/index.html
@@ -210,7 +210,7 @@ <h3><i class="material-icons icon">keyboard</i><span class="tl">keybindings.reco
 		<div id="title_bar_home_button" class="tool" onclick="Interface.tab_bar.openNewTab()"><i class="material-icons icon">home</i></div>
 		<div class="app-drag-region" id="header_free_bar"></div>
 		<div id="update_menu"></div>
-		<div id="settings_profiles_header_menu" class="hidden">
+		<div id="settings_profiles_header_menu" class="hidden tool">
 			<i class="material-icons icon">manage_accounts</i>
 		</div>
 		<ul id="windows_window_menu" hidden>
diff --git a/js/interface/actions.js b/js/interface/actions.js
index 275daaa02..8b1e0217b 100644
--- a/js/interface/actions.js
+++ b/js/interface/actions.js
@@ -2198,9 +2198,10 @@ const BARS = {
 				Toolbars.element_origin,
 				Toolbars.element_rotation
 			].forEach(toolbar => {
-				Toolbars.main_tools.children.forEach(child => {
+				for (let child of Toolbars.main_tools.children) {
+					if (toolbar.children.includes(child)) return;
 					toolbar.add(child);
-				})
+				}
 			})
 		}
 		Blockbench.onUpdateTo('4.4.0-beta.0', () => {
diff --git a/js/interface/interface.js b/js/interface/interface.js
index d554bbe0a..ccad0a47a 100644
--- a/js/interface/interface.js
+++ b/js/interface/interface.js
@@ -424,7 +424,11 @@ Interface.definePanels = function(callback) {
 
 //Misc
 function unselectInterface(event) {
-	if (open_menu && $('.contextMenu').find(event.target).length === 0 && $('.menu_bar_point.opened:hover').length === 0) {
+	if (
+		open_menu && $('.contextMenu').find(event.target).length === 0 &&
+		$('.menu_bar_point.opened:hover').length === 0 &&
+		!document.getElementById('mobile_menu_bar')?.contains(event.target)
+	) {
 		Menu.closed_in_this_click = open_menu.id;
 		open_menu.hide();
 
diff --git a/js/interface/menu_bar.js b/js/interface/menu_bar.js
index 59d1fe0bb..7d1ce409e 100644
--- a/js/interface/menu_bar.js
+++ b/js/interface/menu_bar.js
@@ -10,6 +10,7 @@ class BarMenu extends Menu {
 		this.node.className = 'contextMenu menu_bar_menu';
 		this.node.style.minHeight = '8px';
 		this.node.style.minWidth = '150px';
+		this.icon = options.icon;
 		this.name = tl(options.name || `menu.${id}`);
 		this.label = Interface.createElement('li', {class: 'menu_bar_point'}, this.name);
 		this.label.addEventListener('click', (event) => {
@@ -37,6 +38,7 @@ class BarMenu extends Menu {
 		MenuBar.open = undefined;
 		this.highlight_action = null;
 		this.label.classList.remove('highlighted');
+		if (MenuBar.last_opened == this) document.getElementById('mobile_menu_bar')?.remove();
 		return this;
 	}
 	highlight(action) {
@@ -48,6 +50,7 @@ class BarMenu extends Menu {
 const MenuBar = {
 	menus: {},
 	open: undefined,
+	last_opened: null,
 	setup() {
 		MenuBar.menues = MenuBar.menus;
 		new BarMenu('file', [
@@ -228,7 +231,7 @@ const MenuBar = {
 			]},
 			'plugins_window',
 			'edit_session'
-		])
+		], {icon: 'draft'})
 		new BarMenu('edit', [
 			new MenuSeparator('undo'),
 			'undo',
@@ -270,7 +273,7 @@ const MenuBar = {
 			'select_all',
 			'unselect_all',
 			'invert_selection'
-		])
+		], {icon: 'edit'})
 		new BarMenu('transform', [
 			'scale',
 			{name: 'menu.transform.rotate', id: 'rotate', icon: 'rotate_90_degrees_ccw', children: [
@@ -302,11 +305,13 @@ const MenuBar = {
 			]}
 
 		], {
-			condition: {modes: ['edit']}
+			icon: 'open_with',
+			condition: {modes: ['edit']},
 		})
 
 		new BarMenu('uv', UVEditor.menu.structure, {
 			condition: {modes: ['edit']},
+			icon: 'photo_size_select_large',
 			onOpen() {
 				setActivePanel('uv');
 			}
@@ -330,6 +335,7 @@ const MenuBar = {
 			'resize_texture',
 			'crop_texture_to_selection'
 		], {
+			icon: 'image',
 			condition: {modes: ['paint']}
 		})
 
@@ -350,6 +356,7 @@ const MenuBar = {
 			'save_all_animations',
 			'export_animation_file'
 		], {
+			icon: 'movie',
 			condition: {modes: ['animate']}
 		})
 
@@ -373,6 +380,7 @@ const MenuBar = {
 			'resolve_keyframe_expressions',
 			'delete',
 		], {
+			icon: 'icon-keyframe',
 			condition: {modes: ['animate']}
 		})
 
@@ -382,7 +390,7 @@ const MenuBar = {
 			onOpen() {
 				setActivePanel('timeline');
 			}
-		})
+		}, {icon: 'timeline'})
 
 		new BarMenu('display', [
 			new MenuSeparator('copypaste'),
@@ -392,6 +400,7 @@ const MenuBar = {
 			'add_display_preset',
 			'apply_display_preset'
 		], {
+			icon: 'tune',
 			condition: {modes: ['display']}
 		})
 		
@@ -427,7 +436,7 @@ const MenuBar = {
 			'convert_to_mesh',
 			'auto_set_cullfaces',
 			'remove_blank_faces',
-		])
+		], {icon: 'handyman'})
 		MenuBar.menus.filter = MenuBar.menus.tools;
 
 		new BarMenu('view', [
@@ -458,7 +467,7 @@ const MenuBar = {
 			'advanced_screenshot',
 			'record_model_gif',
 			'timelapse',
-		])
+		], {icon: 'visibility'})
 		new BarMenu('help', [
 			new MenuSeparator('search'),
 			{name: 'menu.help.search_action', description: BarItems.action_control.description, keybind: BarItems.action_control.keybind, id: 'search_action', icon: 'search', click: ActionControl.select},
@@ -515,7 +524,7 @@ const MenuBar = {
 				'reload',
 			]},
 			'about_window'
-		])
+		], {icon: 'help'})
 		MenuBar.update();
 
 		if (Blockbench.isMobile) {
@@ -547,29 +556,100 @@ const MenuBar = {
 			MenuBar.mode_switcher_button = mode_switcher;
 
 			let home_button = document.getElementById('title_bar_home_button');
+			let profile_button = document.getElementById('settings_profiles_header_menu');
 
-			let buttons = [menu_button, search_button, home_button, undo_button, redo_button, mode_switcher];
+			let buttons = [menu_button, search_button, profile_button, home_button, undo_button, redo_button,, mode_switcher];
 			buttons.forEach(button => {
 				header.append(button);
 			})
+
+			header.addEventListener('touchstart', e1 => {
+				convertTouchEvent(e1);
+				let opened, bar, initial;
+				let onMove = e2 => {
+					convertTouchEvent(e2);
+					let y_diff = e2.clientY - e1.clientY;
+					if (y_diff > 16) {
+						if (!opened) {
+							bar = MenuBar.openMobile(menu_button);
+							opened = true;
+							initial = y_diff;
+						}
+					}
+					if (bar) {
+						bar.style.marginTop = Math.clamp(y_diff - 50, -60, 0)+'px';
+						for (let node of bar.childNodes) {
+							if (!node.bbOpenMenu) continue;
+							let offset_center = bar.offsetLeft + node.offsetLeft + node.clientWidth/2;
+							if (Math.abs(offset_center - e2.clientX) < 21) {
+								node.bbOpenMenu(e2);
+								break;
+							}
+						}
+					}
+				}
+				let onStop = e2 => {
+					document.removeEventListener('touchmove', onMove);
+					document.removeEventListener('touchend', onStop);
+					if (bar) {
+						bar.style.marginTop = '0';
+						convertTouchEvent(e2);
+						let y_diff = e2.clientY - e1.clientY;
+						if (y_diff < initial && MenuBar.open) {
+							MenuBar.open.hide()
+						}
+					}
+				}
+				document.addEventListener('touchmove', onMove);
+				document.addEventListener('touchend', onStop);
+			})
 		}
 	},
 	openMobile(button, event) {
-		let entries = [];
+		if (document.getElementById('mobile_menu_bar')) {
+			document.getElementById('mobile_menu_bar').remove();
+			return;
+		}
+		let label = Interface.createElement('label', {});
+		let bar = Interface.createElement('div', {id: 'mobile_menu_bar'}, label);
+		let menu_button_nodes = [];
+		let menu_position;
+		let setSelected = (node, menu) => {
+			menu_button_nodes.forEach(n => n.classList.remove('selected'))
+			node.classList.add('selected');
+			label.innerText = menu.name;
+		}
 		for (let id in MenuBar.menus) {
-			if (id == 'filter') continue;
 			let menu = MenuBar.menus[id];
-			let entry = {
-				id,
-				icon: menu.icon || '',
-				name: menu.name,
-				children: menu.structure,
-				condition: menu.condition,
-			};
-			entries.push(entry);
+			if (id == 'filter') continue;
+			if (!Condition(menu.condition)) continue;
+
+			let node = Interface.createElement('div', {class: 'tool'}, Blockbench.getIconNode(menu.icon));
+			let openMenu = event => {
+				if (MenuBar.last_opened == menu) return;
+				MenuBar.last_opened = MenuBar.open = menu;
+				menu.open(menu_position);
+				setSelected(node, menu);
+			}
+			addEventListeners(node, 'pointerdown touchmove', openMenu);
+			node.bbOpenMenu = openMenu;
+
+			menu_button_nodes.push(node);
+			bar.append(node);
+			if (MenuBar.last_opened == menu || (!MenuBar.last_opened && id == 'file')) {
+				setTimeout(() => {
+					MenuBar.last_opened = menu;
+					menu.open(menu_position);
+					setSelected(node, menu);
+				}, 1)
+			}
+		}
+		document.body.append(bar);
+		menu_position = {
+			clientX: bar.offsetLeft + 7,
+			clientY: bar.offsetTop + bar.clientHeight - 1
 		}
-		let menu = new Menu(entries).open(button);
-		return menu;
+		return bar;
 	},
 	update() {
 		if (!Blockbench.isMobile) {
diff --git a/js/interface/themes.js b/js/interface/themes.js
index 58ad3a415..1560e7c75 100644
--- a/js/interface/themes.js
+++ b/js/interface/themes.js
@@ -435,6 +435,13 @@ const CustomTheme = {
 		CustomTheme.updateColors();
 	},
 	loadThumbnailStyles() {
+		let split_regex;
+		try {
+			// Soft fail for iOS 16.3 and older
+			split_regex = eval('/(?<!\\[[^\\]]*),(?![^\\[]*\\])|(?<!"[^"]*),(?![^"]*")/g')
+		} catch (err) {
+			return;
+		}
 		let thumbnailStyles = '\n';
 		const style = document.createElement('style');
 		document.head.appendChild(style);
@@ -443,7 +450,7 @@ const CustomTheme = {
 			const sheet = style.sheet;
 			for (const rule of sheet.cssRules) {
 				if (!rule.selectorText) continue;
-				thumbnailStyles += `${rule.selectorText.split(/(?<!\[[^\]]*),(?![^\[]*\])|(?<!"[^"]*),(?![^"]*")/g).map(e => `[theme_id="${theme.id}"] ${e.trim()}`).join(", ")} { ${rule.style.cssText} }\n`;
+				thumbnailStyles += `${rule.selectorText.split(split_regex).map(e => `[theme_id="${theme.id}"] ${e.trim()}`).join(", ")} { ${rule.style.cssText} }\n`;
 			}
 		}
 		if (CustomTheme.data.customized) {
@@ -451,7 +458,7 @@ const CustomTheme = {
 			const sheet = style.sheet;
 			for (const rule of sheet.cssRules) {
 				if (!rule.selectorText) continue;
-				thumbnailStyles += `${rule.selectorText.split(/(?<!\[[^\]]*),(?![^\[]*\])|(?<!"[^"]*),(?![^"]*")/g).map(e => `[theme_id="${CustomTheme.data.id}"] ${e.trim()}`).join(", ")} { ${rule.style.cssText} }\n`;
+				thumbnailStyles += `${rule.selectorText.split(split_regex).map(e => `[theme_id="${CustomTheme.data.id}"] ${e.trim()}`).join(", ")} { ${rule.style.cssText} }\n`;
 			}
 		}
 		document.head.removeChild(style);
diff --git a/js/io/formats/modded_entity.js b/js/io/formats/modded_entity.js
index 151b84b4a..88e7c0acd 100644
--- a/js/io/formats/modded_entity.js
+++ b/js/io/formats/modded_entity.js
@@ -242,7 +242,7 @@ const Templates = {
 			// Paste this class into your mod and generate all required imports
 
 
-			public class %(identifier)<T extends %(entity)> extends EntityModel<%(entity)> {
+			public class %(identifier)<T extends %(entity)> extends EntityModel<T> {
 				// This layer location should be baked with EntityRendererProvider.Context in the entity renderer and passed into this model's constructor
 				public static final ModelLayerLocation LAYER_LOCATION = new ModelLayerLocation(new ResourceLocation("modid", "%(identifier_rl)"), "main");
 				%(fields)
@@ -483,7 +483,7 @@ var codec = new Codec('modded_entity', {
 		let model = Templates.get('file');
 
 		model = model.replace(R('bb_version'), Blockbench.version);
-		model = model.replace(R('entity'), Project.modded_entity_entity_class || '');
+		model = model.replace(R('entity'), Project.modded_entity_entity_class || 'Entity');
 		model = model.replace(R('identifier'), identifier);
 		model = model.replace(R('identifier_rl'), identifier.toLowerCase().replace(' ', '_'));
 		model = model.replace(R('texture_width'), Project.texture_width);
diff --git a/js/io/project.js b/js/io/project.js
index b9f813670..bbbd834b9 100644
--- a/js/io/project.js
+++ b/js/io/project.js
@@ -459,6 +459,7 @@ new Property(ModelProject, 'string', 'model_identifier', {
 });
 new Property(ModelProject, 'string', 'modded_entity_entity_class', {
 	label: 'dialog.project.modded_entity_entity_class',
+	placeholder: 'Entity',
 	condition: {formats: ['modded_entity']},
 });
 new Property(ModelProject, 'string', 'modded_entity_version', {
diff --git a/js/modeling/mesh_editing.js b/js/modeling/mesh_editing.js
index cdd9f286e..d80e47a9f 100644
--- a/js/modeling/mesh_editing.js
+++ b/js/modeling/mesh_editing.js
@@ -1046,7 +1046,7 @@ BARS.defineActions(function() {
 		form: {
 			shape: {label: 'dialog.add_primitive.shape', type: 'select', options: {
 				cuboid: 'dialog.add_primitive.shape.cube',
-				rounded_cuboid: 'dialog.add_primitive.shape.rounded_cuboid',
+				beveled_cuboid: 'dialog.add_primitive.shape.beveled_cuboid',
 				pyramid: 'dialog.add_primitive.shape.pyramid',
 				plane: 'dialog.add_primitive.shape.plane',
 				circle: 'dialog.add_primitive.shape.circle',
@@ -1057,12 +1057,12 @@ BARS.defineActions(function() {
 				torus: 'dialog.add_primitive.shape.torus',
 			}},
 			diameter: {label: 'dialog.add_primitive.diameter', type: 'number', value: 16},
-			align_edges: {label: 'dialog.add_primitive.align_edges', type: 'checkbox', value: true, condition: ({shape}) => !['cuboid', 'rounded_cuboid', 'pyramid', 'plane'].includes(shape)},
-			height: {label: 'dialog.add_primitive.height', type: 'number', value: 8, condition: ({shape}) => ['cylinder', 'cone', 'cuboid', 'rounded_cuboid', 'pyramid', 'tube'].includes(shape)},
+			align_edges: {label: 'dialog.add_primitive.align_edges', type: 'checkbox', value: true, condition: ({shape}) => !['cuboid', 'beveled_cuboid', 'pyramid', 'plane'].includes(shape)},
+			height: {label: 'dialog.add_primitive.height', type: 'number', value: 8, condition: ({shape}) => ['cylinder', 'cone', 'cuboid', 'beveled_cuboid', 'pyramid', 'tube'].includes(shape)},
 			sides: {label: 'dialog.add_primitive.sides', type: 'number', value: 12, min: 3, max: 48, condition: ({shape}) => ['cylinder', 'cone', 'circle', 'torus', 'sphere', 'tube'].includes(shape)},
 			minor_diameter: {label: 'dialog.add_primitive.minor_diameter', type: 'number', value: 4, condition: ({shape}) => ['torus', 'tube'].includes(shape)},
 			minor_sides: {label: 'dialog.add_primitive.minor_sides', type: 'number', value: 8, min: 2, max: 32, condition: ({shape}) => ['torus'].includes(shape)},
-			edge_size: {label: 'dialog.add_primitive.edge_size', type: 'number', value: 2, condition: ({shape}) => ['rounded_cuboid'].includes(shape)},
+			edge_size: {label: 'dialog.add_primitive.edge_size', type: 'number', value: 2, condition: ({shape}) => ['beveled_cuboid'].includes(shape)},
 		},
 		onConfirm(result) {
 			let original_selection_group = Group.selected && Group.selected.uuid;
@@ -1278,7 +1278,7 @@ BARS.defineActions(function() {
 						new MeshFace( mesh, {vertices: [vertex_keys[1], vertex_keys[3], vertex_keys[5], vertex_keys[7]]} ), // North
 					);
 				}
-				if (result.shape == 'rounded_cuboid') {
+				if (result.shape == 'beveled_cuboid') {
 					let s = result.edge_size;
 					let rs = result.diameter/2 - s;
 					let r = result.diameter/2;
@@ -1410,11 +1410,11 @@ BARS.defineActions(function() {
 
 			Undo.amendEdit({
 				diameter: {label: 'dialog.add_primitive.diameter', type: 'number', value: result.diameter, interval_type: 'position'},
-				height: {label: 'dialog.add_primitive.height', type: 'number', value: result.height, condition: ['cylinder', 'cone', 'cuboid', 'rounded_cuboid', 'pyramid', 'tube'].includes(result.shape), interval_type: 'position'},
+				height: {label: 'dialog.add_primitive.height', type: 'number', value: result.height, condition: ['cylinder', 'cone', 'cuboid', 'beveled_cuboid', 'pyramid', 'tube'].includes(result.shape), interval_type: 'position'},
 				sides: {label: 'dialog.add_primitive.sides', type: 'number', value: result.sides, min: 3, max: 48, condition: ['cylinder', 'cone', 'circle', 'torus', 'sphere', 'tube'].includes(result.shape)},
 				minor_diameter: {label: 'dialog.add_primitive.minor_diameter', type: 'number', value: result.minor_diameter, condition: ['torus', 'tube'].includes(result.shape), interval_type: 'position'},
 				minor_sides: {label: 'dialog.add_primitive.minor_sides', type: 'number', value: result.minor_sides, min: 2, max: 32, condition: ['torus'].includes(result.shape)},
-				edge_size: {label: 'dialog.add_primitive.edge_size', type: 'number', value: result.edge_size, condition: ['rounded_cuboid'].includes(result.shape)},
+				edge_size: {label: 'dialog.add_primitive.edge_size', type: 'number', value: result.edge_size, condition: ['beveled_cuboid'].includes(result.shape)},
 			}, form => {
 				Object.assign(result, form);
 				runEdit(true, result);
diff --git a/lang/en.json b/lang/en.json
index cf05bb3fe..1100de5f5 100644
--- a/lang/en.json
+++ b/lang/en.json
@@ -539,7 +539,7 @@
 	"dialog.add_primitive.shape.sphere": "Sphere",
 	"dialog.add_primitive.shape.torus": "Torus",
 	"dialog.add_primitive.shape.cube": "Cuboid",
-	"dialog.add_primitive.shape.rounded_cuboid": "Cuboid with Edges",
+	"dialog.add_primitive.shape.beveled_cuboid": "Beveled Cuboid",
 	"dialog.add_primitive.shape.pyramid": "Pyramid",
 	"dialog.add_primitive.shape.plane": "Plane",
 	"dialog.add_primitive.diameter": "Diameter",