diff --git a/src/Decho/App.axaml b/src/Decho/App.axaml
index 2439a53..69627b9 100644
--- a/src/Decho/App.axaml
+++ b/src/Decho/App.axaml
@@ -11,5 +11,14 @@
   
     <Application.Styles>
         <RomzetronTheme  />
+        <Style Selector="Button.IconButton">
+            <Setter Property="Background" Value="Transparent" />
+            <Style Selector="^:pointerover /template/ ContentPresenter#PART_ContentPresenter">
+                <Setter Property="Background" Value="#15FFFFFF" />
+            </Style>
+            <Style Selector="^:pressed /template/ ContentPresenter#PART_ContentPresenter">
+                <Setter Property="Background" Value="#25FFFFFF" />
+            </Style>
+        </Style>
     </Application.Styles>
 </Application>
\ No newline at end of file
diff --git a/src/Decho/Views/ChatView.axaml b/src/Decho/Views/ChatView.axaml
index efa157b..6326224 100644
--- a/src/Decho/Views/ChatView.axaml
+++ b/src/Decho/Views/ChatView.axaml
@@ -24,7 +24,8 @@
 					Foreground="{DynamicResource UiTheme08}"
 					Command="{Binding ToggleUsersPanelCommand}"
 					VerticalAlignment="Top"
-					HorizontalAlignment="Right" />
+					HorizontalAlignment="Right"
+					Classes="IconButton" />
 		</Grid>
 		<views:MessageListView Grid.Row="2" />
 		<views:MessageComposerView Grid.Row="3"
diff --git a/src/Decho/Views/MainWindow.axaml b/src/Decho/Views/MainWindow.axaml
index be87cee..6451984 100644
--- a/src/Decho/Views/MainWindow.axaml
+++ b/src/Decho/Views/MainWindow.axaml
@@ -27,7 +27,8 @@
 					DockPanel.Dock="Right"
 					Background="Transparent"
 					Foreground="{DynamicResource UiTheme08}"
-					HorizontalAlignment="Right" />
+					HorizontalAlignment="Right"
+					Classes="IconButton" />
 
 		<Button i:Attached.Icon="fa-plus"
 				Command="{Binding AddServerCommand}"
@@ -35,7 +36,8 @@
 				Background="Transparent"
 				Foreground="{DynamicResource UiTheme08}"
 				HorizontalAlignment="Right"
-				ToolTip.Tip="Add Server" />
+				ToolTip.Tip="Add Server"
+				Classes="IconButton" />
 		</DockPanel>
 		<views:SidebarView Grid.Row="1"
 						   Grid.Column="0"
diff --git a/src/Decho/Views/SidebarView.axaml b/src/Decho/Views/SidebarView.axaml
index a17fb60..2415e0a 100644
--- a/src/Decho/Views/SidebarView.axaml
+++ b/src/Decho/Views/SidebarView.axaml
@@ -38,7 +38,8 @@
 											Foreground="{DynamicResource UiTheme08}"
 											VerticalAlignment="Center"
 											i:Attached.Icon="fa-cog"
-											Click="OnSettingsClicked">
+											Click="OnSettingsClicked"
+											Classes="IconButton">
 										<Button.ContextMenu>
 											<ContextMenu>
 												<MenuItem Header="Connect"