tool-bar-component {
	.tool-bar {
		background-color: #f0f0f0;
		height: 35px;
		margin-block-end: 0;
		padding-bottom: 0;
		margin-bottom: 0;
		font-size: 0px;
		border-bottom: 1px solid #cdcdcd;
	}

	.small-action-button {
		&.download {
			margin-left: 0px;
		}
		margin: 5px;
	}

	.right-aligned {
		float: right;

		> * {
			float: left;
		}

		&.global-settings {
			right: 20px;
			position: fixed;

			.md-fab i {
				top: 5px;
			}
		}
	}

	loading-gif-map-component {
		margin-top: 5px;
	}
}

tool-bar-component {
	.tool-bar {
		background-color: #f0f0f0;
		height: 35px;
		margin-block-end: 0;
		padding-bottom: 0;
		margin-bottom: 0;
		font-size: 0px;
		border-bottom: 1px solid #cdcdcd;
	}

	.small-action-button {
		&.download {
			margin-left: 0px;
		}
		margin: 5px;
	}

	.right-aligned {
		right: 20px;
		position: fixed;

		> * {
			float: left;
		}
	}

	loading-gif-map-component {
		margin-top: 5px;
	}
}

Fix merge master in toolBar CSS
Fix merge master in toolBar CSS
