diff --git a/retroshare-qml-app/src/ChatView.qml b/retroshare-qml-app/src/ChatView.qml
index 3cbc41b72..144d77e29 100644
--- a/retroshare-qml-app/src/ChatView.qml
+++ b/retroshare-qml-app/src/ChatView.qml
@@ -144,7 +144,7 @@ Item
 			border.color: inferiorPanel.styles.borderColor
 		}
 
-		BtnIcon
+		ButtonIcon
 		{
 
 			id: attachButton
@@ -263,7 +263,7 @@ Item
 			}
 		}
 
-		BtnIcon
+		ButtonIcon
 		{
 
 			id: emojiButton
@@ -290,7 +290,7 @@ Item
 
 		}
 
-		BtnIcon
+		ButtonIcon
 		{
 
 			id: sendButton
diff --git a/retroshare-qml-app/src/components/BtnIcon.qml b/retroshare-qml-app/src/components/ButtonIcon.qml
similarity index 100%
rename from retroshare-qml-app/src/components/BtnIcon.qml
rename to retroshare-qml-app/src/components/ButtonIcon.qml
diff --git a/retroshare-qml-app/src/components/Btn.qml b/retroshare-qml-app/src/components/ButtonText.qml
similarity index 100%
rename from retroshare-qml-app/src/components/Btn.qml
rename to retroshare-qml-app/src/components/ButtonText.qml
diff --git a/retroshare-qml-app/src/components/SideBar.qml b/retroshare-qml-app/src/components/SideBar.qml
index 0361c23eb..d460195ad 100644
--- a/retroshare-qml-app/src/components/SideBar.qml
+++ b/retroshare-qml-app/src/components/SideBar.qml
@@ -111,7 +111,7 @@ Drawer
 					}
 				}
 
-				Btn
+				ButtonText
 				{
 					buttonText: model.title
 					width: parent.width
diff --git a/retroshare-qml-app/src/main-app.qml b/retroshare-qml-app/src/main-app.qml
index 17634d741..f98f66fa7 100644
--- a/retroshare-qml-app/src/main-app.qml
+++ b/retroshare-qml-app/src/main-app.qml
@@ -153,7 +153,7 @@ ApplicationWindow
 
 		}
 
-		BtnIcon
+		ButtonIcon
 		{
 			property bool searchIconVisibility: false
 			property var onClickCB: function (){}
@@ -190,7 +190,7 @@ ApplicationWindow
 		Component
 		{
 			id: rsIcon
-			BtnIcon
+			ButtonIcon
 			{
 				height: imageLoader.height
 				width: imageLoader.height
diff --git a/retroshare-qml-app/src/qml.qrc b/retroshare-qml-app/src/qml.qrc
index fb2a636f0..11258ef48 100644
--- a/retroshare-qml-app/src/qml.qrc
+++ b/retroshare-qml-app/src/qml.qrc
@@ -31,7 +31,7 @@
         <file>ChatBubbleDelegate.qml</file>
         <file>icons/send-message.svg</file>
         <file>icons/attach.svg</file>
-        <file>components/BtnIcon.qml</file>
+        <file>components/ButtonIcon.qml</file>
         <file>icons/smiley.svg</file>
         <file>icons/microphone_mute.svg</file>
         <file>icons/microphone.svg</file>
@@ -40,7 +40,7 @@
         <file>components/AvatarOrColorHash.qml</file>
         <file>components/SideBar.qml</file>
         <file>styles/SideBarStyle.qml</file>
-        <file>components/Btn.qml</file>
+        <file>components/ButtonText.qml</file>
         <file>icons/netgraph.svg</file>
         <file>icons/search.svg</file>
         <file>icons/exit.svg</file>