diff --git a/apps/ui/src/lib/components/UpdateAvailable.svelte b/apps/ui/src/lib/components/UpdateAvailable.svelte
index a41a0cc67..463f4278c 100644
--- a/apps/ui/src/lib/components/UpdateAvailable.svelte
+++ b/apps/ui/src/lib/components/UpdateAvailable.svelte
@@ -81,7 +81,6 @@
 		{#if isUpdateAvailable}
 			<button
 				disabled={updateStatus.success === false}
-				title="Update available"
 				on:click={update}
 				class="icons tooltip-right bg-gradient-to-r from-purple-500 via-pink-500 to-red-500 text-white duration-75 hover:scale-105"
 			>
diff --git a/apps/ui/src/lib/locales/en.json b/apps/ui/src/lib/locales/en.json
index b913c0658..6bb1d62c9 100644
--- a/apps/ui/src/lib/locales/en.json
+++ b/apps/ui/src/lib/locales/en.json
@@ -167,15 +167,15 @@
 		"permission_denied_stop_application": "You do not have permission to stop the application.",
 		"rebuild_application": "Rebuild application",
 		"permission_denied_rebuild_application": "You do not have permission to rebuild application.",
-		"build_and_start_application": "Build and start application",
-		"permission_denied_build_and_start_application": "You do not have permission to Build and start application.",
+		"build_and_start_application": "Deploy",
+		"permission_denied_build_and_start_application": "You do not have permission to deploy application.",
 		"configurations": "Configurations",
 		"secret": "Secrets",
 		"persistent_storage": "Persistent Storage",
 		"previews": "Previews",
 		"logs": "Application Logs",
 		"build_logs": "Build Logs",
-		"delete_application": "Delete application",
+		"delete_application": "Delete",
 		"permission_denied_delete_application": "You do not have permission to delete this application",
 		"domain_already_in_use": "Domain {{domain}} is already used.",
 		"dns_not_set_error": "DNS not set correctly or propogated for {{domain}}.<br><br>Please check your DNS settings.",
@@ -227,14 +227,14 @@
 		"select_database_type": "Select a Database type",
 		"select_database_version": "Select a Database version",
 		"confirm_stop": "Are you sure you would like to stop {{name}}?",
-		"stop_database": "Stop database",
+		"stop_database": "Stop",
 		"permission_denied_stop_database": "You do not have permission to stop the database.",
-		"start_database": "Start database",
+		"start_database": "Start",
 		"permission_denied_start_database": "You do not have permission to start the database.",
-		"delete_database": "Delete Database",
+		"delete_database": "Delete",
 		"permission_denied_delete_database": "You do not have permission to delete a Database",
 		"no_databases_found": "No databases found",
-		"logs": "Database Logs"
+		"logs": "Logs"
 	},
 	"destination": {
 		"delete_destination": "Delete Destination",
@@ -267,7 +267,7 @@
 			"official_providers": "Official providers"
 		},
 		"no_git_sources_found": "No git sources found",
-		"delete_git_source": "Delete Git Source",
+		"delete_git_source": "Delete",
 		"permission_denied": "You do not have permission to delete a Git Source",
 		"create_new_app": "Create new {{name}} App",
 		"change_app_settings": "Change {{name}} App Settings",
@@ -293,14 +293,14 @@
 		"generate_www_non_www_ssl": "It will generate certificates for both www and non-www. <br>You need to have <span class='font-bold text-pink-600'>both DNS entries</span> set in advance.<br><br>Service needs to be restarted."
 	},
 	"service": {
-		"stop_service": "Stop Service",
+		"stop_service": "Stop",
 		"permission_denied_stop_service": "You do not have permission to stop the service.",
-		"start_service": "Start Service",
+		"start_service": "Start",
 		"permission_denied_start_service": "You do not have permission to start the service.",
-		"delete_service": "Delete Service",
+		"delete_service": "Delete",
 		"permission_denied_delete_service": "You do not have permission to delete a service.",
 		"no_service": "No services found",
-		"logs": "Service Logs"
+		"logs": "Logs"
 	},
 	"setting": {
 		"change_language": "Change Language",
diff --git a/apps/ui/src/routes/applications/[id]/__layout.svelte b/apps/ui/src/routes/applications/[id]/__layout.svelte
index 4e9a88557..c91fe6307 100644
--- a/apps/ui/src/routes/applications/[id]/__layout.svelte
+++ b/apps/ui/src/routes/applications/[id]/__layout.svelte
@@ -228,7 +228,6 @@
 		{:else if $status.application.isRunning}
 			<button
 				on:click={stopApplication}
-				title="Stop application"
 				type="submit"
 				disabled={$disabledButton}
 				class="icons bg-transparent tooltip tooltip-bottom text-sm flex items-center space-x-2 text-error"
@@ -253,7 +252,6 @@
 			</button>
 			<form on:submit|preventDefault={handleDeploySubmit}>
 				<button
-					title="Rebuild application"
 					type="submit"
 					disabled={$disabledButton || !isQueueActive}
 					class:hover:text-green-500={isQueueActive}
@@ -285,13 +283,12 @@
 		{:else}
 			<form on:submit|preventDefault={handleDeploySubmit}>
 				<button
-					title="Build and start application"
 					type="submit"
 					disabled={$disabledButton}
 					class="icons bg-transparent tooltip tooltip-bottom text-sm flex items-center space-x-2 text-success"
 					data-tip={$appSession.isAdmin
-						? 'Build and start application'
-						: 'You do not have permission to Build and start application.'}
+						? 'Deploy'
+						: 'You do not have permission to deploy application.'}
 				>
 					<svg
 						xmlns="http://www.w3.org/2000/svg"
@@ -319,7 +316,6 @@
 			class:bg-coolgray-500={$page.url.pathname === `/applications/${id}`}
 		>
 			<button
-				title="Configurations"
 				disabled={$disabledButton}
 				class="icons bg-transparent tooltip tooltip-bottom text-sm"
 				data-tip="Configurations"
@@ -355,7 +351,6 @@
 			class:bg-coolgray-500={$page.url.pathname === `/applications/${id}/secrets`}
 		>
 			<button
-				title="Secret"
 				disabled={$disabledButton}
 				class="icons bg-transparent tooltip tooltip-bottom text-sm"
 				data-tip="Secret"
@@ -387,7 +382,6 @@
 			class:bg-coolgray-500={$page.url.pathname === `/applications/${id}/storages`}
 		>
 			<button
-				title="Persistent Storages"
 				disabled={$disabledButton}
 				class="icons bg-transparent tooltip tooltip-bottom text-sm"
 				data-tip="Persistent Storages"
@@ -417,7 +411,6 @@
 			class:bg-coolgray-500={$page.url.pathname === `/applications/${id}/previews`}
 		>
 			<button
-				title="Previews"
 				disabled={$disabledButton}
 				class="icons bg-transparent tooltip tooltip-bottom text-sm"
 				data-tip="Previews"
@@ -450,7 +443,6 @@
 			class:bg-coolgray-500={$page.url.pathname === `/applications/${id}/logs`}
 		>
 			<button
-				title={$t('application.logs')}
 				disabled={$disabledButton || !$status.application.isRunning}
 				class="icons bg-transparent tooltip tooltip-bottom text-sm"
 				data-tip={$t('application.logs')}
@@ -482,7 +474,6 @@
 			class:bg-coolgray-500={$page.url.pathname === `/applications/${id}/logs/build`}
 		>
 			<button
-				title="Build Logs"
 				disabled={$disabledButton}
 				class="icons bg-transparent tooltip tooltip-bottom text-sm"
 				data-tip="Build Logs"
@@ -513,7 +504,6 @@
 
 		<button
 			on:click={() => deleteApplication(application.name)}
-			title={$t('application.delete_application')}
 			type="submit"
 			disabled={!$appSession.isAdmin}
 			class:hover:text-red-500={$appSession.isAdmin}
diff --git a/apps/ui/src/routes/databases/[id]/__layout.svelte b/apps/ui/src/routes/databases/[id]/__layout.svelte
index 1f94cec79..0741a30a1 100644
--- a/apps/ui/src/routes/databases/[id]/__layout.svelte
+++ b/apps/ui/src/routes/databases/[id]/__layout.svelte
@@ -193,7 +193,6 @@
 				{:else if $status.database.isRunning}
 					<button
 						on:click={stopDatabase}
-						title={$t('database.stop_database')}
 						type="submit"
 						disabled={!$appSession.isAdmin}
 						class="icons bg-transparent tooltip tooltip-bottom text-sm flex items-center space-x-2 text-red-500"
@@ -219,7 +218,6 @@
 				{:else}
 					<button
 						on:click={startDatabase}
-						title={$t('database.start_database')}
 						type="submit"
 						disabled={!$appSession.isAdmin}
 						class="icons bg-transparent tooltip tooltip-bottom text-sm flex items-center space-x-2 text-green-500"
@@ -251,7 +249,6 @@
 				class:bg-coolgray-500={$page.url.pathname === `/databases/${id}`}
 			>
 				<button
-					title={$t('application.configurations')}
 					class="icons bg-transparent tooltip tooltip-bottom text-sm disabled:text-red-500"
 					data-tip={$t('application.configurations')}
 				>
@@ -287,7 +284,6 @@
 				class:bg-coolgray-500={$page.url.pathname === `/databases/${id}/logs`}
 			>
 				<button
-					title={$t('database.logs')}
 					disabled={!$status.database.isRunning}
 					class="icons bg-transparent tooltip tooltip-bottom text-sm"
 					data-tip={$t('database.logs')}
@@ -313,7 +309,6 @@
 			>
 			<button
 				on:click={deleteDatabase}
-				title={$t('database.delete_database')}
 				type="submit"
 				disabled={!$appSession.isAdmin}
 				class:hover:text-red-500={$appSession.isAdmin}
diff --git a/apps/ui/src/routes/destinations/[id]/__layout.svelte b/apps/ui/src/routes/destinations/[id]/__layout.svelte
index fd49f752c..0da7eaaf4 100644
--- a/apps/ui/src/routes/destinations/[id]/__layout.svelte
+++ b/apps/ui/src/routes/destinations/[id]/__layout.svelte
@@ -88,11 +88,10 @@
 	<nav class="nav-side">
 		<button
 			on:click={() => deleteDestination(destination)}
-			title={$t('destination.delete_destination')}
 			type="submit"
 			disabled={!$appSession.isAdmin && isDestinationDeletable}
 			class:hover:text-red-500={$appSession.isAdmin && isDestinationDeletable}
-			class="icons tooltip tooltip-bottom bg-transparent text-sm"
+			class="icons tooltip tooltip-left bg-transparent text-sm"
 			class:text-stone-600={!isDestinationDeletable}
 			data-tip={deletable()}><DeleteIcon /></button
 		>
diff --git a/apps/ui/src/routes/iam/team/[id]/__layout.svelte b/apps/ui/src/routes/iam/team/[id]/__layout.svelte
index 301becf23..32f8d9cbd 100644
--- a/apps/ui/src/routes/iam/team/[id]/__layout.svelte
+++ b/apps/ui/src/routes/iam/team/[id]/__layout.svelte
@@ -49,13 +49,12 @@
 	<nav class="nav-side">
 		<button
 			on:click={deleteTeam}
-			title={$t('source.delete_git_source')}
 			type="submit"
 			disabled={!$appSession.isAdmin}
 			class:hover:text-red-500={$appSession.isAdmin}
-			class="icons tooltip tooltip-bottom bg-transparent text-sm"
+			class="icons tooltip tooltip-left bg-transparent text-sm"
 			data-tip={$appSession.isAdmin
-				? 'Delete Team'
+				? 'Delete'
 				: $t('destination.permission_denied_delete_destination')}><DeleteIcon /></button
 		>
 	</nav>
diff --git a/apps/ui/src/routes/services/[id]/__layout.svelte b/apps/ui/src/routes/services/[id]/__layout.svelte
index 7585cb295..3503c4568 100644
--- a/apps/ui/src/routes/services/[id]/__layout.svelte
+++ b/apps/ui/src/routes/services/[id]/__layout.svelte
@@ -226,7 +226,6 @@
 			{:else if $status.service.isRunning}
 				<button
 					on:click={stopService}
-					title={$t('service.stop_service')}
 					type="submit"
 					disabled={$disabledButton}
 					class="icons bg-transparent tooltip tooltip-bottom text-sm flex items-center space-x-2 text-red-500"
@@ -252,7 +251,6 @@
 			{:else}
 				<button
 					on:click={startService}
-					title={$t('service.start_service')}
 					type="submit"
 					disabled={$disabledButton}
 					class="icons bg-transparent tooltip tooltip-bottom text-sm flex items-center space-x-2 text-green-500"
@@ -285,7 +283,6 @@
 				class:bg-coolgray-500={$page.url.pathname === `/services/${id}`}
 			>
 				<button
-					title={$t('application.configurations')}
 					class="icons bg-transparent tooltip tooltip-bottom text-sm disabled:text-red-500"
 					data-tip={$t('application.configurations')}
 				>
@@ -320,7 +317,6 @@
 				class:bg-coolgray-500={$page.url.pathname === `/services/${id}/secrets`}
 			>
 				<button
-					title={$t('application.secret')}
 					class="icons bg-transparent tooltip tooltip-bottom text-sm disabled:text-red-500"
 					data-tip={$t('application.secret')}
 				>
@@ -351,7 +347,6 @@
 				class:bg-coolgray-500={$page.url.pathname === `/services/${id}/storages`}
 			>
 				<button
-					title="Persistent Storage"
 					class="icons bg-transparent tooltip tooltip-bottom text-sm disabled:text-red-500"
 					data-tip="Persistent Storage"
 				>
@@ -381,7 +376,6 @@
 				class:bg-coolgray-500={$page.url.pathname === `/services/${id}/logs`}
 			>
 				<button
-					title={$t('service.logs')}
 					disabled={!$status.service.isRunning}
 					class="icons bg-transparent tooltip tooltip-bottom text-sm"
 					data-tip={$t('service.logs')}
@@ -408,7 +402,6 @@
 		{/if}
 		<button
 			on:click={deleteService}
-			title={$t('service.delete_service')}
 			type="submit"
 			disabled={!$appSession.isAdmin}
 			class:hover:text-red-500={$appSession.isAdmin}
diff --git a/apps/ui/src/routes/sources/[id]/__layout.svelte b/apps/ui/src/routes/sources/[id]/__layout.svelte
index 3c8b02bdb..1a81b63a4 100644
--- a/apps/ui/src/routes/sources/[id]/__layout.svelte
+++ b/apps/ui/src/routes/sources/[id]/__layout.svelte
@@ -56,7 +56,6 @@
 	<nav class="nav-side">
 		<button
 			on:click={() => deleteSource(source.name)}
-			title={$t('source.delete_git_source')}
 			type="submit"
 			disabled={!$appSession.isAdmin}
 			class:hover:text-red-500={$appSession.isAdmin}