diff --git a/Macro Deck Client.Android/Assets/client.js b/Macro Deck Client.Android/Assets/client.js
index f5607db..eaddee8 100644
--- a/Macro Deck Client.Android/Assets/client.js	
+++ b/Macro Deck Client.Android/Assets/client.js	
@@ -125,10 +125,14 @@ function connect(url) {
 
 					this.buttons = obj.Buttons;
 					for (var i = 0; i < this.buttons.length; i++) {
+						if (!this.buttons[i]) {
+							continue;
+                        }
 						var button = document.getElementById(this.buttons[i].Position_Y + "_" + this.buttons[i].Position_X);
+						var label = document.getElementById("label_" + this.buttons[i].Position_Y + "_" + this.buttons[i].Position_X);
 
 						if (button) {
-							if (this.buttons[i] && this.buttons[i].Icon) {
+							if (this.buttons[i].Icon) {
 								var iconPack;
 								var icon;
 
@@ -157,10 +161,11 @@ function connect(url) {
 								}
 
 								button.style.backgroundImage = 'url(data:image/gif;base64,' + icon.IconBase64 + ')';
-							}
+							} else if (this.buttons[i].IconBase64) {
+								button.style.backgroundImage = 'url(data:image/gif;base64,' + this.buttons[i].IconBase64 + ')';
+                            }
 						}
 
-						var label = document.getElementById("label_" + this.buttons[i].Position_Y + "_" + this.buttons[i].Position_X);
 						if (label) {
 							if (this.buttons[i].Label && this.buttons[i].Label.LabelBase64) {
 								label.style.backgroundImage = 'url(data:image/gif;base64,' + this.buttons[i].Label.LabelBase64 + ')';
@@ -205,7 +210,9 @@ function connect(url) {
 
 
 							button.style.backgroundImage = 'url(data:image/gif;base64,' + icon.IconBase64 + ')';
-						} else {
+						} else if (obj.Buttons[0].IconBase64) {
+							button.style.backgroundImage = 'url(data:image/gif;base64,' + obj.Buttons[0].IconBase64 + ')';
+                        } else {
 							button.style.backgroundImage = '';
 						}
 					}
diff --git a/Macro Deck Client.Android/Assets/style.css b/Macro Deck Client.Android/Assets/style.css
index f259d9f..7537446 100644
--- a/Macro Deck Client.Android/Assets/style.css	
+++ b/Macro Deck Client.Android/Assets/style.css	
@@ -1,6 +1,3 @@
-html {
-} 
-
 body {
 	padding: 10px;
 }
@@ -18,8 +15,6 @@ p, h1, h2, h3, h4, h5, h6, label {
 	transition: all .3s linear;
 }
 
-
-
 .button-row {
 	display: -ms-flexbox;
 	display: flex;
diff --git a/Macro Deck Client.Android/Macro Deck Client.Android.csproj b/Macro Deck Client.Android/Macro Deck Client.Android.csproj
index f6fabe4..27d2c3c 100644
--- a/Macro Deck Client.Android/Macro Deck Client.Android.csproj	
+++ b/Macro Deck Client.Android/Macro Deck Client.Android.csproj	
@@ -42,6 +42,7 @@
     <AndroidSigningStorePass>Emily0704</AndroidSigningStorePass>
     <AndroidSigningKeyAlias>SuchByte</AndroidSigningKeyAlias>
     <AndroidSigningKeyPass>Emily0704</AndroidSigningKeyPass>
+    <EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugSymbols>false</DebugSymbols>
diff --git a/Macro Deck Client.Android/Properties/AndroidManifest.xml b/Macro Deck Client.Android/Properties/AndroidManifest.xml
index 073b4d4..c859cf7 100644
--- a/Macro Deck Client.Android/Properties/AndroidManifest.xml	
+++ b/Macro Deck Client.Android/Properties/AndroidManifest.xml	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="220" android:versionName="2.2.0-beta" package="com.suchbyte.macrodeck" android:installLocation="auto">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="230" android:versionName="2.3.0-beta" package="com.suchbyte.macrodeck" android:installLocation="auto">
 	<uses-sdk android:minSdkVersion="19" android:targetSdkVersion="30" />
 	<application android:label="Macro Deck" android:theme="@style/MainTheme" android:usesCleartextTraffic="true" android:icon="@mipmap/launcher_foreground"></application>
 	<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
diff --git a/Macro Deck Client/Macro Deck Client.csproj b/Macro Deck Client/Macro Deck Client.csproj
index 8ea7480..91db0c1 100644
--- a/Macro Deck Client/Macro Deck Client.csproj	
+++ b/Macro Deck Client/Macro Deck Client.csproj	
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <ProduceReferenceAssembly>true</ProduceReferenceAssembly>
-    <Version>2.2.0-beta</Version>
+    <Version>2.3.0-beta</Version>
     <Authors>Manuel Mayer</Authors>
     <ApplicationIcon>Macro Deck 2021.ico</ApplicationIcon>
     <RootNamespace>SuchByte.MacroDeck</RootNamespace>