diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/ui/StudyNewProjectPanel.java b/python/educational-core/student/src/com/jetbrains/edu/learning/ui/StudyNewProjectPanel.java
index d01c6d1eb4f6..79c83a5e315e 100644
--- a/python/educational-core/student/src/com/jetbrains/edu/learning/ui/StudyNewProjectPanel.java
+++ b/python/educational-core/student/src/com/jetbrains/edu/learning/ui/StudyNewProjectPanel.java
@@ -78,7 +78,9 @@ public class StudyNewProjectPanel extends JPanel implements PanelWithAnchor {
     final LabeledComponent<ComboBox> coursesCombo = LabeledComponent.create(myCoursesComboBox, "Courses:", BorderLayout.WEST);
 
     myRefreshButton = new FixedSizeButton(coursesCombo);
+    myRefreshButton.putClientProperty("JButton.buttonType", null);
     myRefreshButton.setIcon(AllIcons.Actions.Refresh);
+    myRefreshButton.putClientProperty("JButton.buttonType", "square");
     myBrowseButton = new FixedSizeButton(coursesCombo);
 
     final JPanel comboPanel = new JPanel(new BorderLayout());
@@ -139,7 +141,9 @@ public class StudyNewProjectPanel extends JPanel implements PanelWithAnchor {
   }
 
   private void setupBrowseButton() {
+    myBrowseButton.putClientProperty("JButton.buttonType", null);
     myBrowseButton.setIcon(InteractiveLearningIcons.InterpreterGear);
+    myBrowseButton.putClientProperty("JButton.buttonType", "square");
     final FileChooserDescriptor fileChooser = new FileChooserDescriptor(true, false, false, true, false, false) {
       @Override
       public boolean isFileVisible(VirtualFile file, boolean showHiddenFiles) {
diff --git a/python/ide/src/com/jetbrains/python/newProject/actions/ProjectSpecificSettingsStep.java b/python/ide/src/com/jetbrains/python/newProject/actions/ProjectSpecificSettingsStep.java
index af3683f12ae4..753db8469edf 100644
--- a/python/ide/src/com/jetbrains/python/newProject/actions/ProjectSpecificSettingsStep.java
+++ b/python/ide/src/com/jetbrains/python/newProject/actions/ProjectSpecificSettingsStep.java
@@ -247,7 +247,9 @@ public class ProjectSpecificSettingsStep extends ProjectSettingsStepBase impleme
 
   private void addInterpreterButton(final JPanel locationPanel, final LabeledComponent<TextFieldWithBrowseButton> location) {
     final JButton interpreterButton = new FixedSizeButton(location);
+    interpreterButton.putClientProperty("JButton.buttonType", null);
     interpreterButton.setIcon(PythonIcons.Python.Python);
+    interpreterButton.putClientProperty("JButton.buttonType", "square");
     interpreterButton.addActionListener(new ActionListener() {
       @Override
       public void actionPerformed(ActionEvent e) {
@@ -286,7 +288,9 @@ public class ProjectSpecificSettingsStep extends ProjectSettingsStepBase impleme
 
     final Sdk preferred = compatibleSdk;
     mySdkCombo = new PythonSdkChooserCombo(project, sdks, sdk -> sdk == preferred);
+    mySdkCombo.putClientProperty("JButton.buttonType", null);
     mySdkCombo.setButtonIcon(PythonIcons.Python.InterpreterGear);
+    mySdkCombo.putClientProperty("JButton.buttonType", "square");
 
     return LabeledComponent.create(mySdkCombo, "Interpreter", BorderLayout.WEST);
   }